version 5
Merge branch 'master' of https://github.com/duongvc/apps

Conflicts:
	02_code/Gate365/gen/com/travel/gate365/R.java
	02_code/Gate365/res/layout/header.xml
	02_code/Gate365/src/com/travel/gate365/view/alert/AlertActivity.java
	02_code/Gate365/src/com/travel/gate365/view/journeys/JourneysActivity.java