Changes made by Denis Stoyanov (denis.a.stoyanov@gmail.com).
Changes made by Denis Stoyanov (denis.a.stoyanov@gmail.com).
Merge branch 'master' of https://github.com/costelumbu/bestOffer-repository.git

Conflicts:
	Best Offers in Town/scripts/map.js
	Best Offers in Town/views/RegisterView.html
Merge branch 'master' of https://github.com/costelumbu/bestOffer-repository.git

Conflicts:
	Best Offers in Town/scripts/offers.js
	Best Offers in Town/views/MyStores.html