reservations api and make reservations template
Merge branch 'make-reservation' into develop

* make-reservation:
  reservations api and make reservations template

Conflicts:
	server/config/routes.js
	server/controllers/rooms.js
deleted extra commas