Moved image bitmap in on measure etc
Merge branches 'master' and 'master' of https://github.com/blubecks/Paint

Conflicts:
	app/src/main/java/com/thesisloading/paint/PaintView.java