Merge branch 'Set-Map-Duplex'
Merge branch 'Index-And-SCSS-Corrections'
Merge branch 'master' into Index-And-SCSS-Corrections
Prepare friend popIn
Socket Event Player
Modify the mobile Version
GameCtrl Bug fix
Merge branch 'Index-And-SCSS-Corrections' of https://github.com/nclsndr/meetmymusic into Index-And-SCSS-Corrections

Conflicts:
	app/webroot/ng/controllers/GameCtrl.js
firefox FIX !
safari FIX !
Socket & phone
Merge branch 'Index-And-SCSS-Corrections' of https://github.com/nclsndr/meetmymusic into Index-And-SCSS-Corrections

Conflicts:
	app/webroot/ng/controllers/GameCtrl.js
	app/webroot/ng/partials/game.html
add css
Integration :  FriendPopin  &  friend request on mobile
add redirect home on refresh and scss fix
HTML, JS et CSS update
MusicBar directive and logo link fix