Updated change log
Updated gitignore
Merge branch 'master' into development