Add i18n work from Stefan Baecker
Merge branch 'master' into i18n_merge_in

Conflicts:
	assessment/showtest.php
	course/course.php
started work on i18n for javascript. Need to load in javascript files with translations
Add javascript i18n messages
Merge branch 'master' of github.com:drlippman/IMathAS into i18n_merge_in