Merge branch 'master' of github.com:bryntum/fiesta

Conflicts:
	media/js/fiesta/view/testcases/View.js