load of base project
Merge branch 'master' of https://github.com/7orcas/system

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/7orcas/system

Conflicts:
	.gitignore