Fix headers and license
#1952 Fixed hard-coded folder path in library. Not very elegant, perhaps a new solutions will be implemented
Move version 2.1.0 to the trunk