Merge branch 'master' of https://github.com/xmalesia/florakb

Conflicts:
	flora-kalbar.info/app/view/menu.html
#