Fixing null ref bug
Merge branch 'development' of github.com:itsasquare/fsb-proto into development