Squashed 'vm/' changes from cc24e66..8728a90

8728a90 Update subtree.sh
137fd57 Update subtree.sh
d94b32e Update subtree.sh
970ac00 Remove .orig file
d56a89b Merge commit '0baa67a8e4117d5fbede0f0c4410749fdd8f92a0' into develop
66fbc48 Update subtree.sh
84f1965 New subtree.sh
b22e8f3 Merge commit '9577c2b56b3ba30baf14d72ad424358df01c5150'
a5eea7a Merge commit '5d296ad8010f62505a5d114a4013fcd5e101e561' into develop
6d09902 Add pyrocms-database repository to subtree
3f48720 Revert "Merge branch 'master' of bitbucket.org:LorenzoGarcia/harwin"
5d725d0 update pyrocms-vm
27455f7 Set pyrocms-robots for subtree
c8f5dbd Add pyrocms-faq to subtree.sh
14d58f9 .gitignore

git-subtree-dir: vm
git-subtree-split: 8728a903058ceb60897ff1c169bcb744ef8128a4
Merge commit '5ad6214b804e185e6f424e10d92c9aec3d4b28cf'
Squashed 'www/dev/2.2/addons/shared_addons/themes/bootstrap/' changes from ab84b72..ef9095b

ef9095b Fixes in the design

git-subtree-dir: www/dev/2.2/addons/shared_addons/themes/bootstrap
git-subtree-split: ef9095ba2489775766edd540e976168d143d5b10
Merge commit '012495fce3286198b3a2fbdcee1fe8cf39006647'
Squashed 'www/dev/2.2/addons/shared_addons/modules/database/' content from commit 11458cf

git-subtree-dir: www/dev/2.2/addons/shared_addons/modules/database
git-subtree-split: 11458cf9fe860f8afaf72efff471ae44a4f4509c
Merge commit 'e2e3f604052f8019289391cb348836faa791316d' as 'www/dev/2.2/addons/shared_addons/modules/database'
Squashed 'www/dev/2.2/addons/shared_addons/modules/faq/' content from commit 9c562db

git-subtree-dir: www/dev/2.2/addons/shared_addons/modules/faq
git-subtree-split: 9c562dbc0782c7c28d91cdf6b3fcfbbb0ac02d54
Merge commit '8753cf5c79977cec11270bc380e1e8bb62ad14d1' as 'www/dev/2.2/addons/shared_addons/modules/faq'
Squashed 'www/dev/2.2/addons/shared_addons/modules/robots/' content from commit e367f24

git-subtree-dir: www/dev/2.2/addons/shared_addons/modules/robots
git-subtree-split: e367f24c509b411015a2c6c6fc6ace29db75c101
Merge commit 'd5accec59b7a839b5b9c3d1eda00ca79f874cd01' as 'www/dev/2.2/addons/shared_addons/modules/robots'