April updatea

adfas
Merge branch 'April-Update' of https://github.com/pabbylake/NGOConnect into April-Update

Conflicts:
	NGOConnectPrototype2/ProfileTableViewController.h
	NGOConnectPrototype2/ProfileTableViewController.m