Merge pull request #32 from chrislaughlin/master

PR: Adding sad path test & removing comments
Merge pull request #41 from chrislaughlin/master

PR: Adding first changes for issue #34
Replace gulp-conventional-changelog for conventional-changelog
Merge branch 'master' of https://github.com/cam-technologies/time-booker

Conflicts:
	package.json
Merge pull request #42 from martinmicunda/master

Replace gulp-conventional-changelog for conventional-changelog