Upgrade platform
Merge branch 'master' of https://github.com/progutvikling/prosjekt

Conflicts:
	.classpath