big commit (bootstrap, fixed file updating, better document view - add document manipulation)
Merge remote branch 'origin/dev' into dev