Tom Fulton 67c118066b Merge branch 'develop' into feature/allow-collapsing ...

Conflicts:
	app/views/archetype.html

2014-03-02 00:41:20 -07:00

..

config.controller.js

Add option to make "collapsing" feature optional

2014-03-02 00:38:34 -07:00

controller.js

Merge branch 'develop' into feature/allow-collapsing

2014-03-02 00:41:20 -07:00