Changed some h tags to Exo 2
Merge branch 'develop-single-fei-2' into develop