BK-1055 Remove old booki reader application
Merge branch '2.0' of https://github.com/sourcefabric/Booktype into 2.0
BK-1118 Add auto-join group on Create New Group functionality
Merge branch 'BK1055' into 2.0

Conflicts:
	lib/booki/portal/templates/bookiportal/frontpage.html
	lib/booki/reader/urls.py
	lib/booktype/skeleton/base_settings.py.original
Merge branch 'BK1118' into 2.0