Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb

Gemfile

@@ -10,7 +10,7 @@ gem 'exception_notification' # Send error trace
 gem 'execjs'
 gem 'jquery-rails'
 
-gem 'kaminari'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 gem 'mini_magick'
 gem 'mongoid'
@@ -22,6 +22,7 @@ gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
 gem 'tinymce-rails'
+# gem 'therubyracer'