changes for super ambassador
Merged from upstream
Super ambassador feature
404 and 500 templates added, check and improve
Merge pull request #158 from ialja/master

404 and 500 templates added, check and improve
manually merged sparkica-fea_ambassador
Merge pull request #159 from goranche/master

manually merged sparkica-fea_ambassador
Merge pull request #157 from sparkica/fea_ambassador

Fea ambassador
Merge branch 'master' into deployment