zoom on networks
Merge branch 'master' of https://github.com/jming/aural-pleasure

Conflicts:
	static/js/artist.js