htaccess rewrite
Merge branch 'dev' of https://github.com/larkfidel/odikro into dev