Added simple file test
Added todo items
Added component definition to es feature
XMerge remote-tracking branch 'upstream/master'