fixed body padding css
fixed whitespace
Merge branch 'dbfix' into dev

Conflicts:
	public/scripts/services/queue.js