Extended KS_Controller functionality
Merge branch 'dev' of https://github.com/Smubs/ch.bfh.bti7054.w2014.q.keyshop into dev
Renamed the navigation
Merge branch 'ui' of https://github.com/Smubs/ch.bfh.bti7054.w2014.q.keyshop into ui