First step
Merge branch 'develop' of https://github.com/termith/budget into develop