Initial commit
First commit
Merge remote-tracking branch 'upstream/devel'

Conflicts:
	.gitignore