init setup files
Added correct headers for the Daemon to POST json content
Merge branch 'master' into stable_1_2_pranay

Conflicts:
	.gitignore