Merge branch 'master' of https://github.com/HackCharleston/Code

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/libraries/support_v4_19_1_0.xml
	Historic Landscapes App/Historic Landscapes App.iml