resolved noticesand error
Merge branch 'develop' into testing
Merge branch 'testing' into staging