Fix bug in segment duration calculation.
Merge branch 'hotfix/0.6.1'
Merge tag '0.6.1' into develop

0.6.1

Conflicts:
	bower.json
	package.json