Fixed scaling: When scaling is disabled, perfect scale will be enabled. When scaling is enabled, it will fit the image to the screen size.
Increased version number to 1.2.1
Merge branch 'master' into macii

Conflicts:
	project/AndroidManifest.xml
Fixed keyboard layout on portrait