10->12

from feature mx-2
Merge branch 'release-1.0' into feature-mx2

Conflicts:
	AndroidManifest.xml
Merge pull request #6 from algrid/feature-mx2

10->12