Conflicts:
	easybuild/framework/application.py

add empty line before 'built with EasyBuild version X' line in easyconfi...

add empty line before 'built with EasyBuild version X' line in easyconfig, fix debugging msg for extending MODULEPATH (was broken if skip was being used)

Conflicts:

	easybuild/framework/application.py

Proper way to set the logdir

Categorize easyconfig parameters

Conflicts:
	easybuild/easyblocks/c/cp2k.py

Fix missing import for get_software_root in application.py

Change test-files as well

Conflicts:
	easybuild/framework/easyconfig.py