Update .gitignore with bin/ and .gems
Merge branch 'master' into develop

Conflicts:
	.gitignore