Rename src/config.php to src/includes/config.php
Merge branch 'master' into 20141219-KED-52