Misc stuff
Merge branch 'dev'

Conflicts:
	.gitconfig