Merge branch 'master' of https://github.com/ShawnStringfield/drops

Conflicts:
	bower.json
Merge branch 'master' of https://github.com/ShawnStringfield/drops

Conflicts:
	bower.json