Initial attempt with NIF
working port, but without db
Fixed some minor issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore