Updated .gitignore, LICENSE and README.md
Merge branch 'master' into dev