Reworked undo to include slider changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/CanvasView.java