Some fixes
Merge branch 'master' of github.com:ansermak/equipment_flask