fixing activity count
cleanup
Merge branch 'develop'

merging new template update
cleanup
hotfix for profile template
debugged registry problem
made some fixes
fixed location of autodiscover