Merge remote-tracking branch 'origin/master' into layout1

# Conflicts:
#	src/AboutUs.js
#	src/VideoPlayer.js
#	src/reccomenders/Recent.js
#	src/reccomenders/fvitali.js

src/Suggestion.js

@@ -9,6 +9,7 @@ import popGlobaleAssoluta from './reccomenders/popGlobaleAssoluta';
 import Recent from './reccomenders/Recent';
 import similarityArtist from './reccomenders/similarityArtist';
 import popLocaleAss from './reccomenders/popLocaleAss';
+import genreSimilarity from "./reccomenders/genreSimilarity";
 
 // and so on..
 
@@ -45,7 +46,6 @@ class Suggestion extends Component {
               <Route path='/video/:id/popLocaleAss' component={popLocaleAss} />
               <Route path='/video/:id/recent' component={Recent} />
               <Route path='/video/:id/similarityArtist' component={similarityArtist} />
-
               {/* lasciare questo per ultimo */}
               <Route component={Related} />
             </Switch>