simple_format should be marked as html_safe (Closes #1194)
[helpers] Escape text before simple_format
Fix "bootstrap.min" path of production environment
Merge pull request #1197 from tyabe/fix_js_path

Fix "bootstrap.min" path of production environment
Merge remote-tracking branch 'upstream/master' into all-custom-error

* upstream/master:
  Fix "bootstrap.min" path of production environment
  [helpers] Escape text before simple_format
  simple_format should be marked as html_safe (Closes #1194)
fix wrong if