add bootstrap to gitignore
Solve odd dependency type name
Merge branch 'declarationfix'
Merge branch 'master' into Development