Ali: registry modification, main modification, inrouser modification, intro adminmodification, change account modification,
Ali: registry modification, main modification, inrouser modification, intro adminmodification, change account modification,
Ali: registry modification, main modification, inrouser modification, intro adminmodification, change account modification,
Ali: registry modification, main modification, inrouser modification, intro adminmodification, change account modification,
Merge origin/Ali

Conflicts:
	src/bookrental/User.form
	src/bookrental/User.java