Adding editable content window
resolving merge conflicts
Merge branch 'idofxeno-master'
Added app
Merge pull request #2 from approxinfinity/master

Added app