FIrst Upload All FIles
Upload changes
Merge branch 'master' of https://github.com/xiaocids/trending_ta

Conflicts:
	protected/components/tmhOAuth
	protected/components/tmhOAuthExamples