changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/actions.go
Merge pull request #7 from rajthilakmca/master

Fix master/slave json file creation problem