properties for carsten dev machine
Merge branch 'master' of https://github.com/AuScope/EAVL
Merge branch 'master' of https://github.com/AuScope/EAVL
Started work on WPS VM Service
Merge remote-tracking branch 'upstream/master'
Further work on WPS VM Pool
properties for WPS VM Pool
Now managing VM Pool in parallel.
getPDFData now handles empty return values (e.g. if empty input was provided such as when selecting column "hole-Id")
Better VM pool handling.
Merge remote-tracking branch 'upstream/master'
Changed to new VM image North52 WPS 1.5
Removed internal method from delegation
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/auscope/portal/server/web/controllers/PredictorController.java
Fixing budget merge
Merge pull request #2 from fcarsten/master

Started work on WPS VM Service