Fixed issue nr
Merge pull request #501 from thijskh/develop

Various tweaks and documentation improvements
Reordered dependencies
Refactor: Fixed dependence on Symfony RuntimeException that should just be \RuntimeException
Removed @author tag.
Refactor: Fixed incorrect namespacing in ConfigMigration/Version1
Updated changes doc for 1.18
Merge branch 'develop' of git://github.com/janus-ssp/janus into develop
Fix for the release tool, do not attempt to include the listener debugger bundle if it has not been installed by composer
Config-templates dir does not longer exist in root
Simplesamlphp does not have to be removed anymore
UPGRADE is no longer a file in the root dir
Merge remote-tracking branch 'origin/develop'

Conflicts:
	CHANGES
Corrected path to changes
Release of new version 1.18.0
Fixed indent
Merge remote-tracking branch 'origin/master' into develop
#502 Remove cdata tags which broke js
Updated changes
Updated composer lock