updated General BL Activity
Merge branch 'master' of https://github.com/holmesli/eromot

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/.gitignore
	gen/com/app/tomore/R.java
	res/values/strings.xml
	src/com/app/tomore/MainMagActivity.java
Merge branch 'master' of https://github.com/holmesli/eromot

Conflicts:
	AndroidManifest.xml
	bin/.gitignore
	gen/com/app/tomore/R.java
	res/values/strings.xml
	src/com/app/tomore/MainMagActivity.java
Merge branch 'master' of https://github.com/holmesli/eromot

Conflicts:
	gen/com/app/tomore/R.java
	res/values/strings.xml