One up
One up

Conflicts:
	version.py
Force dashboard view
Merge branch 'refs/heads/develop'

Conflicts:
	version.py