Merge branch 'release-1.2.1' into develop
Added user heroes page, fix for update
Bumped version to 1.2.2
Merge branch 'release-1.2.2'