1

1
Merge branch 'master' of https://github.com/Thainq/source

Conflicts:
	iTravel/iTravel/NewsViewController.m