10->11

done on feature-mx1
Merge pull request #7 from algrid/feature-mx1

10->11
Merge branch 'release-1.0' into feature-mx2

Conflicts:
	AndroidManifest.xml