Fix bug with options.shouldLoadMediaGen.
Merge branch 'hotfix/0.10.1'
Merge tag '0.10.1' into develop

0.10.1

Conflicts:
	bower.json
	dist/config-loader-bundled.js
	dist/config-loader-bundled.min.js
	dist/config-loader-test.js
	dist/config-loader-test.min.js
	dist/config-loader.js
	dist/config-loader.min.js
	package.json