Updated vagrant files.
Merge branch 'core'
Merge branch 'master' into web
Added boostrap usage. Change HTML files to be generated using templates.