Made branch compliant with latest version of AndroidNilewapp
Merge branch 'master' into Authentication

Conflicts:
	src/com/mooo/nilewapps/bokbytarappen/LoginActivity.java