Bug fix for pop up blocker!
Merge branch 'master' of https://github.com/Imaginea/SocialByWay

Conflicts:
	app/assets/javascripts/socialbyway/facebook/lib/controller/facebookServiceController.js
	app/assets/javascripts/socialbyway/picasa/lib/controller/picasaServiceController.js
Merge branch 'master' of https://github.com/Imaginea/SocialByWay

Conflicts:
	app/assets/javascripts/socialbyway/facebook/lib/controller/facebookServiceController.js
	app/assets/javascripts/socialbyway/picasa/lib/controller/picasaServiceController.js
changes to pop up blocker issue!
twitter and flickr login issues resolved
Merge pull request #51 from pkiran/master

pop up blocker and login issues