Register page
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/base_layout.html
	templates/book.html