Update ruby to 2.1.1
[travis] Update to ruby 2.1.1
Update sass-rails to 4.0.2
Update rails-i18n to 4.0.2
Add store_accessor for time_format_24 in Preset
Add default locale en in scholarship_statuses default data
Refactor students_controller search and sort
Freeze to sass-rails 4.0.1 and rails 4.0.3
[travis] Set ruby to 2.1.0
Merge branch 'master' into staging

Conflicts:
	admin/gaku_admin.gemspec
	core/gaku_core.gemspec
	frontend/gaku_frontend.gemspec