merged in .gitignore from develop
added breakpoint list to gitignore
resolved gitignore conflict and merged from develop
Merge branch 'develop'
Add vidAppDelegate
Merge branch 'develop'