Start Rest development
Merge branch 'master' into maceBranch

Conflicts:
	.gitignore
Rest for Geo
Merge branch 'master' into maceBranch

Conflicts:
	geotracking/models.py
	geotracking/views.py
fix
Merge branch 'maceBranch'