in the process of adding a splitPane
fixing
Merge branch 'add-scroll-to-etv' into sliding-activities-in-etv
playing
playing with slider
playing with activities
playing
Activity View works. Woo
Activities view looks AMAZING
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
added some comment box functionality
merged with dev-gradle
fixed the layout for activities view
starting edit button