Reduces compile time hopefully.
Removes restore methods of player and scrubbber because of fuctional problems and compile errors.
merges Jonas into master.