Editor ready
Drawing View
Merge branch 'master' of https://github.com/jsuttner/whatsthatad

Conflicts:
	WhatsThatAd/src/com/hasude/whatsthatad/EditorActivity.java