Merge branch 'pr/76'

Conflicts:
	client/bower.json
	server/config/settings.json