test1 branch
test2 branch
Merge branch 'test2'

Conflicts:
	src/com/axprint/official/MainPageActivity.java