Merge pull request #3 from indykish/master

AppConfiguration, add support for it.
merge chanages
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/gulpd.conf
	db/riak_test.go
Merge pull request #4 from rajthilakmca/master

create Addon action
Add env.sh file and update the path
Merge pull request #5 from rajthilakmca/master

Add env.sh file and update the path
Update to kibana template, remove commented code.