Merge branch 'feature/freshdev' into develop
arg, forgot travis img url..