update android manifest for version numbers etc.
update manifest and SDK in .iml
Changed the naming
Merge commit 'c40147f30da0adb82c2cf3f3d76687226f3d7f32' into Develop