gitignore
Merge branch 'develop'

Conflicts:
	.gitignore
rename faclib/database
namespase Fobia => Fac
test bootstrap