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

Conflicts:
	.gitignore
	.settings
	index.coffee
	plugins/calculations.coffee