added colors, prompt text, note that you're editing a comment
modified isEdited()
Merge branch 'sliding-activities-in-etv' into activity-ui-tweaks
changed size of comment color and removed CommentView
edit button fixes
comments
merged dev-gradle in
fixed issues in code review
localization
test fix
fix editing task issue
merged with dev-gradle
cancel comment bug fixed
merge with dev-gradle
fix cancel bug
Merge branch 'dev-gradle' into activity-ui-tweaks
Merge remote-tracking branch 'origin/dev-gradle' into activity-ui-tweaks

Conflicts:
	TaskManager/src/main/resources/taskManager/localization/english.properties
Removing silly print out
Merge branch 'dev-gradle' of https://github.com/slash-slash-no-comment-WPI-cs3733/wpi-suite into japanese
japanese strings added for activities