added button to show userid for debug purposes
Merge branch 'master' of https://github.com/tygrinn/App
changed actionbaractivity to activity
fixed merge conflict
skeleton for upcoming reservations