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

Conflicts:
	iTravel/iTravel.xcodeproj/project.pbxproj

iTravel/iTravel.xcodeproj/project.xcworkspace/xcuserdata/thainq.xcuserda
tad/UserInterfaceState.xcuserstate
	iTravel/iTravel/SettingsViewController.h
	iTravel/iTravel/SettingsViewController.m
	iTravel/iTravel/en.lproj/MainStoryboard_iPhone.storyboard
	iTravel/iTravel/iTravelAppDelegate.m