Fixing conflicts in .pro file.
Concluding merge.
Continuing work with SFML libraries.