changing scaling for image and doodle
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fresco/res/layout/game.xml
	Fresco/src/icreate/fresco/MatchingGame.java