Switching branches, doing some cleanup.
Merge branch 'dev'

Conflicts:
	.gitignore