test
Merge branch 'master' of https://github.com/jp052/hdm-it-projekt-2013-Code

Conflicts:
	IT-Projekt Code/src/de/hdm/gruppe3/stundenplantool/shared/bo/BusinessObject.java