Merge pull request #54 from jerv13/master

HTML Editor created with angular directives
Merge remote-tracking branch 'upstream/master'