Started migrating html to templates
Merge branch 'master' of https://github.com/aimers1975/APTAmySadafConnexusssar
Changed app ID.