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