Initial Commit
Setup Project
Merge branch 'master' of https://github.com/moewes/OJSEntityManager

Conflicts:
	.gitignore