Merge pull request #9 from n8fr8/master

icon and map improvements
Merge pull request #10 from n8fr8/master

two small fixes
Updated scan database
fixed database test activity
Merge branch 'master' of github.com:jtwarren/spidey

Conflicts:
	src/com/example/spidey/ScanService.java