style fix
Merge branch 'back-end' of git@github.com:smartcampuslab/smartcampus.openservices.git into back-end
service and ctrl changes
merge
fixed submit
services edit fixed
Merge branch 'back-end' of github.com:smartcampuslab/smartcampus.openservices into back-end

Conflicts:
	src/main/webapp/WEB-INF/resources/js/controllers.js
	src/main/webapp/WEB-INF/resources/partials/profile/services/edit.html
	src/main/webapp/WEB-INF/resources/partials/profile/services/show.html
not necessary