fix who needs french anyway
moved headers since they are assets and uploaded seperately for now
another mistake with french
update head of index with charset etc
Merge branch 'mnm' of github.com:bubobox/template-bootstrap into mnm

* 'mnm' of github.com:bubobox/template-bootstrap:
  add upload init
  replace image buttons with css
display buttons based on widget settings
Merge branch 'mnm' of github.com:bubobox/template-bootstrap into mnm

* 'mnm' of github.com:bubobox/template-bootstrap:
  fix jshint warnings
  change template nme
  set image thumb size fixed

Conflicts:
	src/scripts/script.js
merge error
Merge branch 'mnm' of github.com:bubobox/template-bootstrap into mnm

* 'mnm' of github.com:bubobox/template-bootstrap:
  add redirect html to deploy