Added resources
Added stuff
Removed old stuff
Merged
Removed multiple source statement in .pro file