Edit artist controller
Merge branch 'master' of https://github.com/solmu2/festapp-server

Conflicts:
	app/js/controllers.js
	app/partials/artist.html
Merge branch 'master' of github.com:solmu2/festapp-server into development

merging again