peiz
Merge branch 'master' of https://github.com/haakondw/toppurapp

Conflicts:
	src/com/ntnu/eit/common/service/AuthenticationServiceTestImpl.java