http put for artist
Merge branch 'development' of https://github.com/solmu2/festapp-server into development

Conflicts:
	app/js/controllers.js
	app/js/services.js
Merge branch 'development' of https://github.com/solmu2/festapp-server into development