Merge origin/master

Conflicts:
	src/main/webapp/Presentation/UserRegistration.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/Presentation/UserRegistration.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/Presentation/UserRegistration.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/Presentation/UserRegistration.xhtml
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/controller/Registration.java
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/controller/Registration.java