changes to templates
Merge branch 'master' of github.com:arolan/flashmath
changes to question activity
Merge branch 'master' of github.com:arolan/flashmath