Merge branch 'spring'
Update .gitignore
Merge branch 'master' into spring