Merge pull request #27 from hrvoje1212/dev

Added Bing and mapbox tile layers and control to handle them
show polyong on edit form
Merge branch 'master' into project_view

Conflicts:
	django_project/core/settings/project.py
Merge pull request #28 from icrni/project_view

Project view
Added map with area of interest display on detail page