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/WS/WCFNail.java