tostring
Merge branch 'master' of github.com:KristinnOgGudmundur/RUber

Conflicts:
	src/java/is/ru/honn/ruber/service/UserService.java