merge
Merge branch 'master' of
https://github.com/if12b088/SWE2_Micro_ERP_GUI.git

Conflicts:
	SWE2_Micro_ERP_GUI/src/at/technikum/wien/winterhalder/kreuzriegler/swe2/gui/Constants.java