Add language codes
Merge branch 'master' of https://github.com/schoolmatch/school_match

Conflicts:
	app/views/layouts/application.html.haml