users and switching tasks are not displayed
user auto gen only shows remove/add. no names.
Change-Id: I9371ef3dce5dc96f791b0deca1d7e292a7d719cd
refactored around so taskPresenter does the compareTo method on tasks
Thus, taskModel no longer needs to hold the whole list of users.
removed line that called nothing in bucket presenter.
able to edit or choose no label
Change-Id: Ia633c3ba9e40df750b47600e1be50c2c3753cf65
Merge branch 'feature/comments4' into feature/colors4
AND fixed a bug with unmodified/modified for category label.
comments are displayed for labels as well

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/model/TaskModel.java
Change-Id: Ie1f540fafe05a8d5b100284baa902dc9b628ee94
Removed unused import and added @param comment in
CommentView.CommentView()
Added comment in CommentView.toggleTextField()
bug fixes and additional functionalty, continued from merge
1. post button disabled until editing task
2. changed color options and increased font size for color
3. I can't change size of the ColorComboBox yet.
4. removed "these fields required" bug when switching buckets for a task.
5. removed excess calls to revalidate+repaint.
6. bucket.writeToView() was redundant, so removed.
Change-Id: If93f55e6c750435ec2e1798703b035b26e6969ce
Patch 1: Added requirements to tasks
Patch 2: Added a view similar to the user view to the task view
Patch 3: Add missing comments
Patch 4: Merge dev into this branch and solve merge conflict
Patch 5: add a drop-down menu to display requirements, not done yet!!!
Patch 7: now the requirement is partially working
Patch 8: Now the requirement can open the tab, but the view cannot jump to requirement module
Patch 9: fix comments and tabs
Change-Id: I5e0788caf2aa57e5f5215f69ae3e380e71466d7e
Updated:
- be able to jump the view to requirement manager
- fix the exception when click requirement button with None requirement
Merge branch 'dev' of https://github.com/Acstylos/wpi-suite into feature/requirements

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/model/ActivityEntityManager.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/BucketObserver.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/BucketPresenter.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/TaskObserver.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/TaskPresenter.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/BucketView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/MiniTaskView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskView.java

Change-Id: I2d623d99fee1c5afeafce57edcdf4746fd27a4f5
Merge branch 'dev' of https://github.com/Acstylos/wpi-suite-tfij into feature/requirements
Solve merge conflicts
Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/model/TaskModel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/TaskPresenter.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskView.java
Merge branch 'dev' of https://github.com/Acstylos/wpi-suite-tfij into feature/requirements
add file level comments to some test files
Merge branch 'dev' of https://github.com/Acstylos/wpi-suite into feature/colors4

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/model/TaskModel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/BucketPresenter.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/TaskPresenter.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/MiniTaskView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskView.java
Move method from BucketPres to TaskPres because a TaskPres should do it.
also fix bug where dragging task exposes bad background
merge colorfix into dev
Allows editing of the bucket title in the view. Doesn't save to database yet. Has prompting functionality with the old title.
Update some icons. Nothing to see here.

Change-Id: I2a1749b6cefadc73ce039085df576b0b32e79bad
Major Changes to how Workflow and Buckets are created and saved. Also allows for changing buckets names to be stored in the DB.

IMPORTANT >>>>>THIS CHANGE WILL REQUIRE A CLEAN DB.<<<<<
Also, because of the new way we're adding buckets to the DB, the first time it's run it will be slow. Without the Thread.sleep(1second) there are thread concurrency problems where certain buckets get added before others, and that's bad m'kay (You'll get completed as the first bucket and new as the either 2nd or 3rd. It's a completely random order each time I ran it without thread.sleeps).

Change-Id: I55c8ce16b89101b1ad1a3d8237c38cbdf3e7d927
Fixes issues #14 and #16. Makes the layout similar between extended and collapsed views. Also moves the padding on the top of the label down 4 pixels.
Fixes issue #17. setting model's title was in incorrect position.

Change-Id: Iea546e2bf941fccd8b073234da94e58939f88589
Merge "add file level comments to some test files" into dev