up
Merge branch 'master' of https://github.com/chrismckelt/lacjam

Conflicts:
	src/WebClient/App/Documents/DocumentView.cshtml