merge develop branch

code reorganization, bugfixes, SCSS