du taf!
Merge conflict EvetView.php
Resolve merge conflict
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants