initial try
Merge branch 'master' into bootstrap3

Conflicts:
	lib/rfk/static/css/bootstrap-theme.css
	lib/rfk/templates/base.html
branch now in a "usable" state