update lay out
Merge branch 'master' of https://github.com/quocpp/lbd

Conflicts:
	App/src/main/java/com/LBD/app/DataAdapter.java