added nodemon.json
Merge remote-tracking branch 'origin/master' into requirejs

Conflicts:
	bower.json
	package.json