Merge branch 'hotfix/0.2.14'

* hotfix/0.2.14:
  keep variable naming convention consistent
fix js error in toggler
Merge branch 'hotfix/0.2.15' into develop

* hotfix/0.2.15:
  fix js error in toggler