hoopa! Whiteboard Style
Merge branch 'master' of github.com:OpenSourceSag/django-dash2013

Conflicts:
	scrum/templates/scrum/whiteboard.html