Fix order in test
Merge remote-tracking branch 'origin/master' into rails4
Update development.rb template
Replace ckeditor ruby gem with plain js lib