(feat) user represented by pin drop on map
Merge branch 'feat/user_locaton_marker'

Conflicts:
	client/app/scripts/controllers.js