Upgraded service management.
Merge branch 'master' of https://github.com/Zakkeri/SE_Project2014

Conflicts:
	app/views/serviceviews.py