temp.
Merge branch 'dev' of github.com:wimbot32259/M3-BeatMatrix into dev

Conflicts:
	BeatMatrix/bin/classes.dex
	BeatMatrix/bin/resources.ap_
Song edit dialog is working better, inits seekbars at values, can't set song end before
beginning, working on speed scaler.