refactoring
Merge branch 'master' of ssh://github.com/ISI-nc/fragaria-ui