Merging, also added services startup
Merge branch 'master' of https://github.com/JoshGangloff/Grid2Go.git

Conflicts:
	src/backend/Utils.java