Update gitignore and develop branch

Change-Id: Ide7b83d380c099c2dc4771476def75782376e1b1