initial commit
Merge branch 'ui-changes' of git://github.com/johngruen/whiskerboard into johngruen-ui-changes

Conflicts:
	board/templates/base.html
	board/templates/board/service_detail.html
Merge branch 'johngruen-ui-changes'