mopping up uncommitted files
Merge pull request #14 from yiendos/CREATE_MODULES

mopping up uncommitted files
Merge branch 'develop' of github.com:yiendos/motekalender into develop
Ensuring menu item links display correctly in back end
Merge pull request #15 from yiendos/HOOK_UP_MENU_XML

Ensuring menu item links display correctly in back end
Merge branch 'develop' of github.com:yiendos/motekalender into develop
Merge branch 'develop' into CREATE_SEARCH

Conflicts:
	admin/models/lodges.php
	languages/admin/en-GB.com_motekalender.sys.ini