copypaste will kill world;
Merge remote-tracking branch 'origin/master'

Conflicts:
	base_api/views.py
copypaste will kill world;