Fixed error on bower.json
Merge branch 'master' of https://github.com/wtelecom/intrepidjs
Fixed bower error
Conflicts:
	public/vendor/bower.json