Added data to json files and updated some bindings
Merge branch 'cosmin' of http://github.com/cosmin-malutan/mciconf into cosmin

Conflicts:
	app/index.html
	app/script.js