Fix bugs
Merge branch 'master' of https://github.com/TheZoker/proBoot3

Conflicts:
	template/index_body.html
	template/memberlist_view.html