new bar feature
feature update
Merge branch 'feature/bar' into develop