added gitignore
Commit from feature/restrictuser
More merging from feature/restrictuser
Merge branch 'develop'

Conflicts:
	.gitignore