badges, etc
Merge branch 'master' into shaun

Conflicts:
	_js/user-operations.js
minor
Merge branch 'master' into shaun

Conflicts:
	_css/main.css
	_js/objects.js
fixing symbola conflicts
Merge branch 'shaun'

Conflicts:
	_css/main.css
	_js/objects.js
	sftp-config.json