DemoFragment.java
Merge branch 'master' of https://github.com/WinHuStudio/iTrip

Conflicts:
	src/client/src/com/itrip/fragment/DemoFragment.java
Merge branch 'master' of https://github.com/WinHuStudio/iTrip
Merge branch 'master' of https://github.com/WinHuStudio/iTrip
Merge branch 'master' of https://github.com/WinHuStudio/iTrip

Conflicts:
	src/client/src/com/itrip/fragment/DemoFragment.java