- * new sorting (latest,oldest,least_studied,most_studied -> rename impending)
 - indentation fixes
 - preliminary i18n support
Merge branch 'master' of https://github.com/fl1p/word_up

Conflicts:
	app/controllers/vocabs_controller.rb
	app/models/vocab.rb
	app/views/vocabs/_vocab.html.haml

 - integrated changes from commit 70d6a9601b470ac5e35167e2a778e260faf539b5
 - * new sorting for vocabs (latest,oldest,least_studied,most_studied)
 - fixed indentations
 - initial i18n support