Add loggong.
Add context prosessor.
Merge branch 'develop' into HEAD
Merge branch 'develop' into HEAD
Add ajax_view decorator.
Add javascript logging.
Merge remote-tracking branch 'origin/develop' into feature_framework

Conflicts:
	src/feedknot/administration/views.py
Merge remote-tracking branch 'origin/feature_framework' into develop

Conflicts:
	src/feedknot/administration/views.py
	src/feedknot/common/views.py
	src/templates/base.html
Merge remote-tracking branch 'origin/develop' into feature_feed