[new] some new things
Merge branch 'master' of github.com:psoluch/copernicus

Conflicts:
	lib/Smarty_plugins/function.menu.php