T
Merge branch 'master' of https://github.com/jimianellil/SurveyAverage

Conflicts:
	code/re.tpl
Merge branch 'master' of https://github.com/jimianellil/SurveyAverage

Conflicts:
	code/re.tpl