Switched to slim for REST handling
Implemented logout functionality
Merge remote-tracking branch 'origin/master'