Localeapp
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit

Conflicts:
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml