server settings
Merge branch 'development'
Merge branch 'cscw'
Merge branch 'cscw'
Merge branch 'cscw'
Merge branch 'cscw'
Merge branch 'cscw'
added CSCW flag with affordances for log in and author log in
merge
hi
hi

Conflicts:
	server/templates/papers.html
Added same CSCW change to schedule page