...
Merge branch 'master' of https://github.com/githuz/Disabled.git

Conflicts:
	src/com/jkyh/disabled/LoginActivity.java
	src/com/jkyh/disabled/fragments/ImportExportFragment.java