refactoring
Merge branch 'master' of https://github.com/steinargl/groupy

Conflicts:
	src/main/java/no/sag/groupy/data/repo/UserRepository.java
Merge branch 'master' of https://github.com/steinargl/groupy

Conflicts:
	src/main/java/no/sag/groupy/data/repo/UserRepository.java