iului
Merge branch 'master' of https://github.com/barthnet/ibsys2.git
efifef
Merge branch 'master' of https://github.com/barthnet/ibsys2.git

Conflicts:
	app/controllers/Application.java
	app/logic/ApplicationLogic.java