Merge branch 'develop'
Merge branch 'develop' into task-58-add_glyphicons
[58] Bring bootstrap assets into local resources

* In order to avoid the Glyphicons directory
  problem, we are now simply bringing all
  Bootstrap less files and glyphicons into the
  site's src/path/to/Resources/public/ directory.
  This means that the less files and glyphicons
  will have to be manually updated when Bootstrap
  is updated.
[58] Combine css/js assets and uglify
[60] Add less files and change base layout
[60] Update dependencies
Merge branch 'task-60-change_css_to_less' into develop