Minor bug fixes
Merge branch 'master' of https://github.com/sami1971/SimplyMobile

Conflicts:
	Android/SimplyMobile.sln