contact list
merged
Merge branch 'master' of https://github.com/SBMG/iWed2.0

Conflicts:
	application/views/apps/messages/contact-list.php