tweaking the console apps
Merge branch 'development' into qa

* development:
  tweaking the console apps