update
update
Merge branch 'master' of https://github.com/nguyenthien/test_app

Conflicts:
src/vn/carousell/common/configs/Config.java
Merge branch 'master' of https://github.com/nguyenthien/test_app

Conflicts:
	src/vn/carousell/common/configs/Config.java