Updated gitignore.
Merge branch 'develop'
Changed icon.
Merge branch 'develop'