Merge master to develop
fixing credentials
Merge develop to master