New submodule dojo-war
Improved tomcat overlays
Updated maven war plugin version
Updated travis configuration
Testing second conf with travis-ci
Customised tomcat war file
Merge remote-tracking branch 'origin/development'

* origin/development:
  Customised tomcat war file
  Testing second conf with travis-ci
  Updated travis configuration
  New submodule dojo-war Improved tomcat overlays Updated maven war plugin version