Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

app/views/oauth2/create.js.erb

@@ -0,0 +1,7 @@
+<%if @error.present?%>
+var alertDiv = $('<div class="alert alert-danger"><%= @error[:msg]%></div>')
+$("#container").prepend(alertDiv)
+setTimeout(function() {
+  $('.alert').remove();
+}, 3000);
+<%end%>