fixing bug where events would automatically resize
Merge branch 'develop' into feature-tidy
adding <h:form> and adding the under construction page