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

Conflicts:
	bin/classes/com/airbrush/airbrushrecorder/ServicePathLog.class
CHANGED: edited some layouts