update startup instructions
Merge branch 'master' of http://nb.znovate.com/git/nb
fix syntax error
Merge branch 'html'
HTML icons work
Merge branch 'master' of https://github.com/nbproject/nbproject
Dates displayed in local timezones:
- Dates converted in models.py to UTC-based UNIX timestamp.
- Dates converted to pretty text in JavaScript (instead of Python)
- Note: potential issues might arise due to strange daylight savings time behavior.
Updated install and makefile to include support for pytz
Stylistic improvements for threadview and notepaneview
Removed link to Google Form and replaced it with mailto links to nb-team
Cleaning up unused files and methods.
Minor css tweak for replyrequesteds tyles
Updated instructor icon
Updated instructor icon, again
Updated instructor icon in light theme
Updated lock icon
Small CSS edits to accommodate latest nbicon changes.
Merge branch 'html'
Merge branch 'master' of github.com:nbproject/nbproject

Conflicts:
	README
tmp fix for not spamming NB admin w/ error msgs