Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into errorBranch

# By Ronald R. Gemao (1) and Vince Elizaga (1)
# Via Vince Elizaga
* 'develop' of https://github.com/elwhizard/MeRoRs:
  changed routes.js 	- updated “require reservations”
  resolved conflicts

Conflicts:
	server/controllers/users.js