delete configuraton.php
Merge branch 'master' of https://github.com/Tchiz/OlivierCoupry

Conflicts:
	configuration.php