Work in progress on upgrading to 0.3.11
Merge branch 'master' of github.com:Anephenix/dashku

Conflicts:
	package.json