license=Apache2
Merge remote-tracking branch 'hh/newBuildProcess' into newBuildProcess

Conflicts:
	bower.json
	package.json