Merge branch 'master' into develop
fix: temporary load jquery before angular for avoid jqLite
Merge branch 'develop'