Added common to .gitignore
Merge master into dev