in the process of adding a splitPane
fixing
Merge branch 'add-scroll-to-etv' into sliding-activities-in-etv
playing
playing with slider
You can drag tasks into word now!
playing with activities
playing
Initial commit
Activity View works. Woo
Activities view looks AMAZING
Drag cursor should now accurately reflect what will happen on drop
make prettier
Merge branch 'dev-gradle' into sliding-activities-in-etv

Conflicts:
	TaskManager/src/main/java/taskManager/controller/EditTaskController.java
	TaskManager/src/main/java/taskManager/controller/TaskInputController.java
	TaskManager/src/main/java/taskManager/view/ActivityView.java
	TaskManager/src/main/java/taskManager/view/Colors.java
	TaskManager/src/main/java/taskManager/view/EditTaskView.java
Removed abandoned code.
Merge branch 'dev-gradle' into sliding-activities-in-etv

Conflicts:
	TaskManager/src/main/java/taskManager/view/EditTaskView.java
pretty stuff
merge with newer version
etv layout changes
Merge remote-tracking branch 'origin/dev-gradle' into dragon-export

Conflicts:
	TaskManager/src/main/java/taskManager/controller/TaskController.java
	TaskManager/src/main/java/taskManager/view/TaskView.java