no message
no message
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/base.html
menu items
Merge pull request #11 from ilendl2/master

site infos added