Abbreviation added
Merge branch 'master' of https://github.com/tdwuethr/HSLU

Conflicts:
	inc/subject.inc.php