Added debug version
Cleanup debug function
Merge branch 'master' into debug

Conflicts:
	feedreader_gui/static/js/outline.js
Merge remote-tracking branch 'origin/master'