Test

Test
Merge branch 'Test' of https://github.com/pabbylake/NGOConnect into Test

Conflicts:
	NGOConnectPrototype2.xcodeproj/project.pbxproj
	NGOConnectPrototype2/NGOAnnotationView.h
	NGOConnectPrototype2/NGOAnnotationView.m
	NGOConnectPrototype2/NGOMapAnnonation.h
	NGOConnectPrototype2/NGOMapViewController.h
	NGOConnectPrototype2/NGOMapViewController.m