Revert "v2.0"

This reverts commit d72a5155c4374ed2f66b8cc9257f08e826191098.
Merge remote-tracking branch 'origin/feature' into feature

Conflicts:
	blog/forms.pyc
	db.sqlite3
	static/js/js.js
	static/js/js_re.js
Merge pull request #8 from rostikoff/feature

v2.5