#time 1m

* Removing >= from bower file and using ~
#time 1h

* Applying custom changes for holidayJS2013 project!
* Changing to use a custom html file so we can edit the html to suit the project needs
* Updated grunt to only clean .js files in dist folder
#time 1m

* Removing \ from html file
Merge remote-tracking branch 'origin/develop-holidayJS2013' into develop-holidayJS2013

Conflicts:
	dist/angular-camera.html