Loading config settings from JSON object. Fixed some issues.
Merge branch 'master' of https://github.com/CosminSontu/resourcing-demo

Conflicts:
	index.html
	nbproject/project.properties
	src/app.js
	src/config.js
	src/main.js