make some changes
Merge branch 'master' of https://github.com/teamreactive/cubo

Conflicts:
	db.sqlite3
	lugares/models.py