update
Merge branch 'master' of https://github.com/NhamPhanDinh/math

Conflicts:
	MathLogic/project.properties
	MathLogic/res/layout/activity_home.xml
	MathLogic/src/ydc/math/braintest/mathlogic/MainActivity.java
	MathLogic/src/ydc/math/braintest/mathlogic/PlayGameActivity.java