Merge branch 'develop' into feature/supporter
f1fb5a4
# Conflicts: # app/panel/components/HeaderMenu.jsx # app/panel/constants/constants.js # app/panel/reducers/index.js # src/classes/ConfData.js