Merged some files
 Merged some files
Merge branch 'master' of github.com:a71993/AngularProtoypeEngine

Conflicts:
	.c9/metadata/tab0
	.c9/metadata/workspace/README.md