user location marker added
Merge branch 'master' of https://github.com/leonson/practicum

Conflicts:
	customer/PNC Mobile App.xcodeproj/project.pbxproj