some bugfixes, deal with no data connection better
remove
Merge remote-tracking branch 'origin/master'

Conflicts:
	NextBus/bin/AndroidManifest.xml