Merge branch 'master' of github.com:jaycrossler/draggable-map-widgets

Conflicts:
	js/app.js