merge with production bug fixes
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev