merging
fixed errors
merging
added layout for bii/requirements.bii
Merge branch 'fran-master'