Merge branch 'develop'. v1.0

Conflicts:
	approot/views/core.py