bootstrapping interface restructured, everything is based on bootstrap.cf now
Merge remote-tracking branch 'origin/master'