composer.json update
Merge remote-tracking branch 'origin/bootstrap_3.0.0' into bootstrap_3.0.0