Update
Merge branch 'master' of https://github.com/ahuimanu/GoTeamApp

Conflicts:
	Service/server.js