Merge branch 'laravel_dev' into adminpage

…Made minor edits to topic.blade.php and TopicController.

… the move function in Resource.php. Still need to verify that move() works.

…ct thing.

bring in tree data fix changes (take 2)

merge changes from master that delete the design folder

bring recent deletion of the design folder onto the adminpage branch

Turns out that this merge was problematic (it got rid of files!)

This reverts commit ce6fbe3, reversing
changes made to 53a643d.

Revert "these files disappeared for some reason. I'm adding them back"

This reverts commit 6d03362.

…and ancestors()

…es, and their connections in issue #32

…e issue #32

…the data (#32)

adminpage

…ctions

Finish adminpage work for now