Codeship I
adding repo to package.json
Merge remote-tracking branch 'origin/master' into beta

Conflicts:
	package.json