Merge branch 'master' into help_dev

MAnually resolved conflicts:
EdiromOnline/resources/css/edirom.css