Moved mapsautotest to /static directory
fixed merge conflict that didn't seem to contain a conflict