fix merge
Merge branch 'master' of github.com:GuillaumeFlambard/OGame
add facebook connect
fix merge
fix merge
fix merge
fix merge
fix merge
Merge branch 'master' of github.com:GuillaumeFlambard/OGame
fix merge
Merge branch 'master' of github.com:GuillaumeFlambard/OGame
Facebook connect