Added .rdb to git ignore. Don't fuck with me.
Added time.sleep to collabedit as a temporary fix to for event bus and server race condition.
Merge branch 'develop' into dynamic_instantiation_client

Conflicts:
	static/js/main.js
Merge branch 'develop' into dynamic_instantiation_client
Merge conflicts.
Merge conflicts.
Added back dynamic instantiation.
Logging fixes.
Removed dump.rdb from git ignore. Fixed indentation.
Removing sleep from collabedit.
Merge pull request #82 from jivid/dynamic_instantiation_client

Dynamic instantiation client