Closes #56 remove content security policy addon
Merge pull request #60 from mattmarcum/remove-csb

Closes #56 remove content security policy addon
Merge remote-tracking branch 'softlayer/develop' into feature/ember-cli-0-1-3

Conflicts:
	package.json