10->12

from feature mx-2
Merge pull request #7 from algrid/feature-mx1

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

Conflicts:
	AndroidManifest.xml
Merge pull request #9 from algrid/master

pull from feature mx2 to master
Merge pull request #11 from algrid/feature-mx2

Feature mx2