rename glyphicons stylesheet
add assets config
add vimeo video
fix size of vimeo video
add locales
add chart js
upgrade video embed
replace vimeo video
Merge branch 'feature/add_video_to_main_page' into develop

* feature/add_video_to_main_page:
  replace vimeo video
  upgrade video embed
  add chart js
  fix size of vimeo video
  add vimeo video
  add assets config
  rename glyphicons stylesheet

Conflicts:
	app/views/web/welcome/index.html.haml
replace video on main page
Merge branch 'release/1.0.17'

* release/1.0.17:
  replace video on main page
  replace vimeo video
  upgrade video embed
  add chart js
  add locales
  fix size of vimeo video
  add vimeo video
  add assets config
  rename glyphicons stylesheet
t sMerge tag '1.0.17' into develop

Add conteest video

* tag '1.0.17':