test
test
Merge branch 'xmlParsers'

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