Merge branch 'dev'

* dev:
  Removing superfluous text file
Merge branch 'master' into dev

* master: