Merging branch player into master
Added the player into the main window
Player fully integrated in the main window