Merge branch 'develop' of https://github.com/Agreemates/agreemates into merge-test
Merge branch 'develop' of https://github.com/Agreemates/agreemates into merge-test
 testing calandar
testing cal
added initial cal
added calendar
Bit more testing
Couple more messages tests and fix testing for travis
Exit properly on every testing type
Merge branch 'develop' into tests

Conflicts:
	server/test/routes/chores.spec.js
Merge branch 'develop' of https://github.com/Agreemates/agreemates into add-calendar
adding more calendar
Merge pull request #271 from Wizecoder/tests

Message board tests and fix testing on travis
Finished testing messages
adding more chores tests
fix a bug where bills table is not shown
fix comment
working modal on event click
added daily chores
Comments tests