testing musicgraph wiring
Merge branch 'master' of https://github.com/bscip/mhd2014

Conflicts:
	Gulpfile.js
	app/scripts/src/main.js
musicgraph module wired