network changes
Merge branch 'devel' into secret-feature
Troll import working
Fixed inset in column view
Merge branch 'devel' into secret-feature

Conflicts:

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/vie
w/sidebar/TaskCreateView.java
Merge fix
Merge pull request #108 from SixAppeal/secret-feature

Secret feature