i1_n
Merge branch 'master' of github.com:levelup42/levelup

Conflicts:
	config/locales/fr.yml