Testing github commit
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
removed githubtest.txt
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added prototype of Tags PropertyEditor, needs styling.
Removed 't' from tags propertyeditor' editor.html
Merge with hesselberg-master