upgrade
starting upgrade with writing tests for itemview
events tests written
Merge branch 'upgrade' into develop

Conflicts:
	tests/karma-main.js
updating karma to show all tests passing