Per Olav Flaten Push #002
 - Fixed conflicting files from library to main project