Minor renames and such
Fixing manifest
Merge branch 'dev-gradle' into minor-refactor
Merge branch 'dev-gradle' into sliding-activities-in-etv

Conflicts:
	TaskManager/src/main/java/taskManager/view/EditTaskView.java