Add form:select user.role to userEdit.jsp
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of https://github.com/tranzero/SoftServe_Java-105_Project.git into develop