Updated the databases
Merge branch 'dev' of https://github.com/bharaththiruveedula/Map-your-friend into dev
Modified .htaccess file to work for localhost