修改tour
Merge branch 'master' of github.com:brightac2013/sydney_tour

Conflicts:
	protected/data/20130909.sql