fixes #58 & fixes #59
Merge branch 'dev'

Conflicts:
	client/index.html