refactor
travis config
Merge branch 'features/front' into devel