Changed Eclipse compiler to 1.7
Merge branch 'master' of https://github.com/OttMatiisen/Default

Conflicts:
	src/ee/ut/math/tvt/teamDefault/IntroUI.java