Merge branch 'dev' into a/feature/#54

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/tasks/_tasks_box.html.erb
refactor tasks file upload to behave the same way on create and edit, #54
refactor removing uploads in Tasks#edit, #54
refactor tasks_controller; add tests for uploads, #54
Merge branch 'a/feature/#54' into Axolotl