merge whole shit form futurice
some thing
update merge
Merge branch 'master' of github.com:solmu2/festapp-server into development

Merging this
Merge branch 'master' of github.com:solmu2/festapp-server into development

merging again
http put for artist
merge from master
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
basic services
Merge pull request #1 from solmu2/feature/create_services

Feature/create services