Added null check
adding fields
Merge branch 'develop' of https://github.com/axsauze/projectelephant into develop
asset files fix
Merge branch 'develop'