fixed mini bugs;
Merge remote-tracking branch 'origin/master'

Conflicts:
	base_api/views.py
fix reset + back;