removed context.xml
Merge branch 'dev'

* dev:
  removed context.xml