Merge pull request #93 from rpandey1234/master

Fix bug with main activity loading
Added publish activity to funnel
Merge pull request #94 from elihart/funnel

Added publish activity to funnel
merge conflicts