big update with problems..
Merge branch 'master' of https://github.com/barthnet/ibsys2.git

Conflicts:
	app/logic/ApplicationLogic.java