Merge pull request #186 from JJK801/fix_nullable

Fix nullable values (models + templates)
Merge remote-tracking branch 'origin' into fix_nullable