Merged 'research' branch to master
Merged in changes from research branch
Merge branch 'master' into research

Conflicts:
	Telegent/UI/Common/TGStatusView.m