minor
Merge branch 'master' of https://github.com/patilkr/userCSP

Conflicts:
	lib/main.js