before merge from windows to osx
Merge branch 'master' of https://github.com/ashkon/circus

Conflicts:
	Gruntfile.js
	bower.json