some path changes and updated gitnore.
Merge branch 'develop'