Player at time 0 and margin on clips
Merge branch 'develop' of github.com:buttleofx/ButtleOFX into develop