bootstrap installed
Merge branch 'master' into authorization