Function rename
Merge branch 'negroni' of github.com:xyproto/genericsite into negroni

Conflicts:
	menugen.go