patched core and views
initial version
Merge branch 'master' of https://github.com/markbannister/dev1collaboration

Conflicts:
	.gitignore