initial
Merge branch 'master' of https://github.com/typhonedev/development

Conflicts:
	.gitignore