enhanced back button
Merge branch 'master' of github.com:fh-salzburg/peppermind