Merging conflict.
Merge branch 'develop' of github.com:emory-libraries-ecds/ATLMaps into develop

Conflicts:
	atlmapsEmber/js/app.js