Modify git ignore file.
Merge branch 'masterApp' into masterExt