Fixed a problem with websocket connections not opening because the port number was not provided.
Merge branch 'master' of https://github.com/WISE-Community/WISE-Portal
cleaned up portal_sample.properties emaillisteners section. removed berkeley settings from emaillisteners section.
Changed the InformationController to dynamically retrieve the server port number used for the websocket url.
Merge branch 'master' of https://github.com/WISE-Community/WISE-Portal
Added link to preview project in run setup confirmation email.
Removed ui-html.properties, now we're using ui-html_en_US.properties.
Updated javamail from 1.4 to 1.4.7, updated way the smtp properties were being read in in JavaMailHelper.java
Disabled excessive hsql logging in log4j.properties
added missing descriptions. small spanish translation fix by cristian
added back parts of section 1 from ui-html.properties into ui-html_en_US.properties that relates to admin pages.
Added the websocket base url to the portal properties. Also use a default websocket url if the websocket base url is not provided.
Internationalized most of admin pages
Removed section 1 from ui-html_en_US.properties
Adjusted format of nightly summary email sent by AdminJob
updated dutch (nl) translations by stephanie at ghent
updated spanish translations by cristian in Argentina, Dutch translations by Stephanie at Ghent
added missing translation key/value pairs for register student page.
Fixed a problem with the forgot teacher username and forgot teacher password page where it would not send the email to the teacher.
Merge branch 'master' of https://github.com/WISE-Community/WISE-Portal
fixed signup link reported by cristian:
Before you login, if you visit some of the other pages, let say "features", the link provided by the "Create account" button doesn't work, it takes you to an Apache error page
Added description entries for the teacher email entries that I previously forgot to include.
internationalized preview project list page, which is accessible from the main homepage.
Merge branch 'master' of https://github.com/WISE-Community/WISE-Portal

# By geoffreykwan
# Via geoffreykwan
* 'master' of https://github.com/WISE-Community/WISE-Portal:
  Added description entries for the teacher email entries that I previously forgot to include.
Fixed an exception caused by missing translation entries when an error occurs when a student tries to register for a run.