Update ga
Refactor template and front end js
Merge branch 'develop'