changes
Merge branch 'master' of https://github.com/InfWGospodarce/projekt.git

Conflicts:
	transporter-server/src/org/pwr/transporter/server/web/controllers/account/AccountController.java