Reworked undo
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/MainActivity.java
	app/src/main/java/zwaggerboyz/instaswaggify/viewpager/FilterListAdapter.java
	app/src/main/java/zwaggerboyz/instaswaggify/viewpager/OverlayListAdapter.java
Merge remote-tracking branch 'origin/master'