Merge branch 'hotfix-2.6.1'
2.7.0 init
init
work
books
delete submodule
Merge branch 'hotfix-2.7.0' into develop

Conflicts:
	templates/frontend/index.html