Merge pull request #6 from indykish/master

Update  kibana template, remove commented code.
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
Remove db dependency in actions.go
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/actions.go