add object builders and object creation controllers
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	js/events.js
	js/objects.js