from KB
from kb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views.py
	app/views.pyc
	error.log