Markup
Merge branch 'master' of https://github.com/vslinko/translation-typesetting

Conflicts:
	public/views/translations.jade