Fixed test data
Fixed collections and views in id=0
Fixed templates in id=0
Fixed tests if id=0
Updated screenshots
Merge branch 'master' into requirejs

Conflicts:
	app/static/js/collections.js