changes on development

Change-Id: I59c6dc2689c65851434b4854ee9fcb528c734ce9
add newFileInMaster.txt

Change-Id: I708ac683ab252482038845b918d305f4665caa19
Merge branch 'master' into development