fix some crap
Merge branch 'development'

* development:
  fix some crap