assertion error fix
Merge branch 'master' into fs_social
login facebook working