Modified form
Merge branch 'master' of github.com:phylotastic/architastic

Conflicts:
	controllers/tree.py
Merge branch 'master' of github.com:phylotastic/architastic
Merge branch 'master' of github.com:phylotastic/architastic
Merge branch 'master' of github.com:phylotastic/architastic

Conflicts:
	controllers/tree.py
Modified form in tree.py
Merge branch 'master' of github.com:phylotastic/architastic