got the add button working and server wired up.
Merge branch 'master' into tutorial

Conflicts:
	static/js/gestalt.js