update
Merge branch 'master' of https://github.com/Catpaw42/Area51_E2014.git

Conflicts:
	Xray/src/database/dao/mysql/BrugerDaoImplExtended.java