wiki summary
Merge remote-tracking branch 'origin/master'

Conflicts:
	datamng/urls.pyc
	datamng/views.pyc
	dataset/views.pyc
	myturk/urls.pyc
	myturk/views.pyc
	projects/views.pyc
	userprofile/views.pyc
	vis/urls.pyc
	vis/views.pyc