update gitignore
re-arrange bootstrap
Merge branch 'master' into production