Merge
Merge branch 'master' of https://github.com/bruce3557/Timera

Conflicts:
	Timera/src/codevenger/timera/view/MixView.java