backend modifications server side
Merge branch 'dev' of https://github.com/giedomak/abeer into dev