Update README.md
Trying to fix sass gems issue
Move time_format_24 from presets into new migration
Merge branch 'master' into staging

Conflicts:
	frontend/gaku_frontend.gemspec