GitIgnore set - try again
Added User en Users class; added fixtures; modified isis.properties concerning automatic services
Merge branch 'master' of https://github.com/johandoornenbal/socrates

Conflicts:
	.gitignore
	socrates_app/fixture/src/main/java/nl/socrates/fixture/UsersFixture.java