merged master with MVP local_env
merged with spotify searching
added spotify play button
Merge branch 'master' into local_env

Conflicts:
	www/js/controllers.js
	www/templates/nowplaying.html