idk
Merge branch 'master' of https://github.com/wrongway88/AirbrushRecorderAndroid

Conflicts:
	bin/classes.dex
CHANGED: new ui