Try to get pins working
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/workspace.js
Fix null reference when database empty, merge firebase to master.