Ändrat buildfile
Merge branch 'master' of https://github.com/idmobema/skolprojekt
Merge branch 'master' of https://github.com/idmobema/skolprojekt

Conflicts:
	build.xml
Merge branch 'master' of https://github.com/idmobema/skolprojekt