Merge branch 'master' into develop
added firebase as dependecy to module
Merge branch 'develop'