fixed git files
merged master into taglib