Bumping version
Merge branch 'develop'
Activating PROD mode in master branch

By modifiying the HTML comments accordingly.
Merge branch 'develop'

Conflicts:
	package.json
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	client/index.html
Merge branch 'develop'
Merge branch 'master' into develop

Conflicts:
	client/index.html

This merge was needed once, to incorporate some master-specific changes
(production mode HTML comments) back into develop.