Fix merge conflict
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop

Conflicts:
	client/dist/main.js
	client/dist/main.min.js
	client/dist/main.min.js.map