Made advances on Map
cleaned merge conflict
working AJAX, markers not implemented
Merge branch 'master' into map