fixed issues with ajax mod_rewrite plus several other tweaks
modified base config and page to have a pretty urls config
Fixed merge issues