Merge pull request #1 from AuScope/master

Pull upstream
Merge pull request #2 from AuScope/master

Update
Merge pull request #3 from AuScope/master

Changes
Merge pull request #4 from AuScope/master

Updates
Add dependency on PROMS Client.
Merge branch 'master' of https://github.com/lupiter/VHIRL-Portal

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/AuScope/VHIRL-Portal
Merge branch 'master' of https://github.com/AuScope/VHIRL-Portal
Messing around.
Merge branch 'master' of https://github.com/AuScope/VHIRL-Portal

# By Terry Rankine (6) and dunkgray (1)
# Via Terry Rankine (2) and dunkgray (1)
* 'master' of https://github.com/AuScope/VHIRL-Portal:
  Add the curled elevation data to the zip.  Removing spaces as the end of two lines so autogenerating files works for me.
  Adding Java 7 support for heroku
  * no java 8 and powermock?
  documentation - diagrams
  increment buildnumber plugin
  * new jslint more string friendly.
  * Unit tests dont call file logging
Yeah more mucking around.
Creating a service to be a central point to manipulate the provenance records.
Merge branch 'master' of https://github.com/AuScope/VHIRL-Portal

# By Alexander Krumpholz (3) and others
# Via Alexander Krumpholz (3) and Terry Rankine (3)
* 'master' of https://github.com/AuScope/VHIRL-Portal:
  Cherry-Picked from https://github.com/AuScope/VEGL-Portal/commit/9d9dacaee330ab738071fb8b4dd56d9bfe521c0a
  Portal repository migrated to nexus
  Pin to a revision that has the multi file upload Fix unit tests....
  The zone is now coming from the template.
  changed heights to % to avoid filter layer to be covered (in most cases)
  Changes to allow multiple files to be uploaded at once.
Oh bother. Reverting changes that I put in by mistake while trying to debug my own code. Sorry.
Checkstyle + fixes to names to make Spring happy.
I can't get the old version of Jetty to work any more. Maybe that's because it's from 2010 :/
Merge branch 'master' of https://github.com/AuScope/VHIRL-Portal

# By Terry Rankine
# Via Terry Rankine
* 'master' of https://github.com/AuScope/VHIRL-Portal:
  RELEASE VERSION 1.1.0
Make dev keypair name configurable
Default to vgl-developers keypair for back compat.
Configure keypair as a property of CloudComputeService beans