removed mam config json from .gitignore
Merge branch 'refs/heads/develop' into feature/android-dev