Fixed #19
Merge branch 'master' of https://github.com/ingenieroariel/webandgis

Conflicts:
	layers/models.py