Merge branch 'master' of https://github.com/MrJensen/BFIS

Conflicts:
	BFIS/src/main/AndroidManifest.xml