OSX installation instruction
Merge branch 'master' of git@github.com:/andreas-p/admin4.git

Conflicts:
	README
More