Merge branch 'dev' of github.com:EMayej/we into dev
Merge branch 'dev'