some redundant string removed
conflicts resolved
loading continues after screen rotation; map hybrid
Google+ Auth