edit file user
Merge branch 'master' of https://github.com/odom/room-management-system

Conflicts:
	booking-system/module/Booking/config/module.config.php
user management