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

Conflicts:
	02_code/Gate365/res/layout/activity_settings.xml
	02_code/Gate365/res/layout/header.xml
	02_code/Gate365/res/values/styles.xml