Change API version
fix .gitignore
Merge branch 'master' into marks

Conflicts:
	.gitignore
remove trash
remove trash. part 2