FIX
FIX
Order Added
Merge origin/master

Conflicts:
	src/java/mail/registration/RegistrationPage.html
	src/java/mail/registration/RegistrationPage.java
OrderPage Ready! Needs Style. onSubmit is not functional, data resource is not DAO just HardCoded Map.