adding stats
adding stats
adding stats again
Merge branch 'master' into deploy

Conflicts:
	marcopolo/amatgeo/views.py