Emulator capabilities
Merge branch 'master' of github.com:sennav/GPSDroid

Conflicts:
	README.md