partial unit test for -a
Merge branch 'develop' into moar_options_unit_testing
add unit tests for --avail-easyconfig-params and --list-easyblocks command line options
fix empty files
replace spaces by \s+ in regex patterns
Merge pull request #515 from boegel/moar_options_unit_testing

add unit tests for --avail-easyconfig-params and --list-easyblocks command line options
fix broken unit tests by fiddling with sys.path instead of PYTHONPATH to test cmdline options that require a set of easyblocks
Merge pull request #516 from boegel/moar_options_unit_testing

fix broken unit tests
make unit tests also work when no easybuild-easyblocks package is installed
bump version to v1.2.0
Merge pull request #519 from boegel/v1.2.x

bump version to v1.2.0
bump version to 1.3.0dev
Merge branch 'v1.2.x' into develop

Conflicts:
	easybuild/tools/version.py
Merge branch 'develop' of github.com:hpcugent/easybuild-framework into develop
Merge pull request #517 from boegel/moar_options_unit_testing

make unit tests also work when no easybuild-easyblocks package is installed
Merge branch 'develop' into optional_intel_fftw_wrappers