Button Changes
Merge branch 'master' of https://github.com/MissionBit/mission-animate

Conflicts:
	edit.html