Added proper code for new maintenance mode feature.
Tweak maintenace mode handler.
Added dynamic avatars to import hero modal
Merge remote-tracking branch 'upstream/develop' into develop