added permission
Merge branch 'master' of https://github.com/GQNC-IT/Fieldbookv0.2

Conflicts:
	FieldBook/src/com/example/fieldbook/LoginActivity.java