Visualization of objects from xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/submit.js