Merge change 339

* changes:
  adding concept of features to accounts