fix in facebook login
fix facebook login
fix facebook login with cookies
handle missing fb cookie
Revert "handle missing fb cookie"

This reverts commit a73a6d11a564a7c65d6f67b2c56c486257c270ea.
Revert "fix facebook login with cookies"

This reverts commit 323207c02f7f10eb1d78e411fa4d8b4f62ff14b2.
fix margin on homepage button
merged conflicts
style fixes
added naqeshny 2013 dostor
add aditional files to asset precompile
fix database.yml for new location
fixes for deployment
added database.yml-example
fix deploy script
added test page
escape javascript in article debate
fixes