Merge branch 'master' of https://github.com/ycj0808/Travel.git

Conflicts:
	src/com/android/travel/db/DBHelper.java
Merge branch 'master' of https://github.com/ycj0808/Travel.git