Merge pull request #234 from dennisd7/merge-test

fixes highlight chore bug
Move delete button on chores page
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop

* 'develop' of https://github.com/AgreeMates/AgreeMates:
  fixes more chores bugs
  fixing chores bugs

Conflicts:
	public/app/components/chores/chores.html
fixing chores bugs
Merge branch 'develop' of https://github.com/Agreemates/agreemates into merge-test
fixing bugs