"screen pohi"
Merge branch 'master' of https://github.com/a71993/AngularProtoypeEngine

Conflicts:
	protoAngular/client/index.html
	protoAngular/client/main/main.js
	protoAngular/client/project/project.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	protoAngular/client/index.html
	protoAngular/server/main/app.js
	protoAngular/server/main/config.js
"screen pohi"