add diffing ability
kill loose bracket in template, fix code indentations
merge master <-> diffs
make test_letter_voting_widget wait for database to update
remove old versions of jquery
Merge branch 'master' into diffs
Merge branch 'userProfile' into test

Conflicts:
	src/digidemo/ajax.py
	src/digidemo/templates/digidemo/overview.html
Made the user Profile page, Shifted the login to the nav bar , fixed the broken links in the main Page