javascriptを別出しにして、base.htmlで読み込むように修正。
Merge remote-tracking branch 'origin/develop' into feature_model
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_model

Conflicts:
	src/templates/base.html
	src/templates/feedknot/SearchFeed.html
クロスサイトリクエストフォージェリ対策
render_to_responseをrenderに切替
マージしたことで動かなくなっていたので修正
Merge remote-tracking branch 'origin/feature_feed' into feature_feed

Conflicts:
	src/feedknot/administration/views.py
	src/feedknot/box/views.py
	src/feedknot/feed/views.py
	src/feedknot/sample/views.py
CommonEdit修正
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_auth