Storing changes for a merge
Resolved Conflicts
Merge branch 'master' of https://github.com/Bringer128/TeamZone

Conflicts:
	lib/EmailVerifyService.js
JsInject Fork commit
JsInject Fork commit
Experiment with jsInject
Experiment with jsInject
Experiment with jsInject
Expiermine twith jsInject
Mising checkin of Service Factory file
using typescript
using typescript
using typescript
dont need jsInject folder
changes location of jsInject
moved jsInject file
setup for karma and karma-typescript
setup for karma and karma-typescript
setup for karma and karma-typescript
setup for karma and karma-typescript
More dev dependencies added