update
Merge remote-tracking branch 'origin/master'

Conflicts:
	projects/views.pyc
	vis/models.pyc
	vis/views.pyc
	wiki/views.pyc