Resolve all conflicts
Fix badly resolved files
Fix boostrap asset
Reactivating server_static_assets
Change Facebook Oauth App code