Fixing category logic
Merge branch 'master' of https://github.com/cipele46/cipele46-wp
Properly implemented view model properties
Merge branch 'master' of https://github.com/cipele46/cipele46-wp