Added Development > build: "make bootstrap" notes.
update readme to resolve conflict
Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip