no message
Merge branch 'contacts-integration' of 192.168.0.3:tan-chong/sa into contacts-integration

Conflicts:
	AndroidManifest.xml
1.) point all to TC server, external ip
2.) included the proposed login screen
3.) fixed contact list offline refresh issue
Merge branch 'contacts-integration' of 192.168.0.3:tan-chong/sa into contacts-integration