Added .gitignore
Merge branch 'devel'
Merge branch 'devel'

Conflicts:
	.gitignore
Update to version 0.2.5
Started development of version 0.2.6