Merge branch 'master' of https://github.com/vanquangtoknow/Andrew

Conflicts:
	NavigationDrawer v1/src/WS/WCFNail.java
Merge branch 'master' of https://github.com/vanquangtoknow/Andrew

Conflicts:
	NavigationDrawer v1/src/Adapter/ListCheckInfoTableTempAdapter.java
	NavigationDrawer v1/src/Adapter/ListTrackingTempAdapter.java
	NavigationDrawer v1/src/DTO/CheckInfoTableTemp.java
	NavigationDrawer v1/src/DTO/TrackingTemp.java
	NavigationDrawer v1/src/com/example/android/navigationdrawerexample/fgm_manager_checkincheckout.java
	NavigationDrawer v1/src/com/example/android/navigationdrawerexample/fgm_tracking.java
dvav