actions
all queries
Merge branch 'master' of https://github.com/alexcazacu/bigdata

Conflicts:
	main/views.py
miau