fixed bug on site map
Merge branch 'master' into dev
updated profile form help text
Merge branch 'master' into dev