no message
Merge branch 'master' of https://github.com/thanhtranduc0706/ATDD

Conflicts:
	ATDD/res/layout/dialog_add_order.xml
	ATDD/src/main/java/com/qsoft/atdd/ui/activity/MainActivity.java
	ATDD/src/main/java/com/qsoft/atdd/ui/model/Order.java
no message
Merge branch 'master' of https://github.com/thanhtranduc0706/ATDD

Conflicts:
	ATDD/res/values/colors.xml