ClipsController Update
Merge branch 'master' of github.com:mgx-alander/AMDES