merges
Merge branch 'master' of https://github.com/apochocolate/viddo
fixed destroy redirect