json upload
json upload
Merge branch 'master' of github.com:a71993/AngularProtoypeEngine

Conflicts:
	protoAngular/bower.json
	protoAngular/client/index.html
	protoAngular/client/main/main.js
bower.json