Changed routes on controllers etc.
Merge branch 'master' of https://github.com/jakaarl/wepa