points
Merge branch 'develop' of https://github.com/FityCity/FityCityApp into develop

Conflicts:
	templates/vendor-detail.html