Made project work again!! :) :) :)
Merge remote-tracking branch 'origin/master'