facebook and g+ login working
resolving merge conflict