Fixed refresh

On page refresh should no longer re-submit the form.
Fixed merge issues

Fixed.
Changed stuff to be compatible

--
Merge branch 'master' of https://github.com/duytrann/HipperEnterpriseTeam4

Conflicts:
	HipperEnterprise
V0.3/target/classes/com/controller/PatientController.class