changes
Merge branch 'master' of https://github.com/aamod1990/olxDemo

Conflicts:
	api/controllers/adddataController.js
	config/routes.js
	views/home/location.ejs