Config travis
Java 7 only
Test against OracleJDK 7 and OpenJDK 7
Merge branch 'feature/TravisCI' into develop

* feature/TravisCI:
  Test against OracleJDK 7 and OpenJDK 7
  Java 7 only
  Config travis
Changes for Travis
Merge branch 'hotfix/v2.1.1' into develop

* hotfix/v2.1.1:
  Brought back jquery
  Removed some files
  Build canoes
  Checkpoint
  Updated download information
Update status
Install support
Merge branch 'feature/Better_fetch_status' into develop

* feature/Better_fetch_status:
  Install support
  Update status
DICOM documentation
Pools now contain the port they listen on

Taken directly from the Notion configuration
Display the link for the documentation server
Updated documentation
Install will now restart Notion
Added the query template to ui assets
Documentation and UI updates
Cleanup before build
Proper hostname
Get the host for the pool
Don't wipe out password and salt when updating the user