Changes made by Sean Wilkening (sean@ia-nyc.com).
Merge branch 'master' of https://github.com/srhise/kendoPhotos.git

Conflicts:
	KendoPhotos/index.html
Merge branch 'master' of https://github.com/srhise/kendoPhotos.git

Conflicts:
	KendoPhotos/app/assets/stylesheets/frontend.css
	KendoPhotos/app/assets/stylesheets/frontend.less
Merge branch 'master' of https://github.com/srhise/kendoPhotos.git

Conflicts:
	KendoPhotos/scripts/login.js