Update .gitignore
Merge branch 'develop' into bitshares

Conflicts:
	.gitignore