Merge remote-tracking branch 'origin/master'

Conflicts:
	src/projekt/Projekt.java
Merge branch 'master' of https://github.com/zottwn/Projekt2014

Conflicts:
	src/projekt/Projekt.java