reservations

new reservation (met bugs)
edit reservation
Merge remote-tracking branch 'origin/User'