In between commit from SVN ([glotaran~glotaran-1-3:87] layout update 1)
Changed the base source code to use Maven as its build environment.
fixed untracked files
After fixing bugs in manifest and layer files, and dependency issues
Updated branding
Merge branch 'feature/upgrade-to-maven' into develop
layout update
layout update2
Added extra JVM parameters in pom files to increase max memory available during testing and debugging.
Merge branch 'develop' of https://github.com/jsnel/glotaran into develop
layout update2
Bug fixes for branding, and PQ Dataloader.
Fixed bug which would not properly load a Streak image file without temporal calibration.
updated .gitignore
Merge branch 'release/1.4.0'

Conflicts:
	.gitignore