Progress Bar
Merge branch 'Navid'

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