Added Analytics to All Templates
Merge branch 'analytics' into develop