Added payment type columns and headers to calendar view.
Merge branch 'develop' of ssh://github.com/Stratofish/Budget into develop