refactor bootstrap.
POS fix
composer
Merge origin/master