- upped version number
Merge branch 'master' of github.com:sozialhelden/wheelmap-android

Conflicts:
	wheelmap/wheelmap-it/AndroidManifest.xml
	wheelmap/wheelmap/AndroidManifest.xml
- fixed manifest conflict