Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	SketchIt/src/com/avialdo/sketchit/activities/MainActivity.java