Merge branch 'development' into spellcasting

Conflicts:
	static/js/charsheet.js
	static/js/viewmodel.js
	templates/charsheet.jade