Version 2.1

Release v2.1 (#136)

* Update metadata to 2.1

* result_selector, control inserting of add_element | add_file if element_id | doc_id are null

* Set missing headers
Remove unused imports
Remove TODO's