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