Merging with developmnet and resolved the conflicts
Twitter integration to application
Added user twiter credentials to the application
Added validations to the user creation from social websites
Merged development to mybranch and resolved conflicts
Updated password fields in sign up page, Updated application registration id with facebook while communicating with facebook and updated header with sign out link, if user is already logged in
Fixed error in sessions controller
Updated Styles with latest changes
Updated layout header, Added js validations and Added displaying of flash messages
Renamed the image with problematic file name
Integrated 4 pages in Applciation (Getting Started page, dashboard page, friends page and friend_profile pages)
conflict resolved
Resolved conflict when merged the development code with authentication branch
Updated notifications styles
Integrated new show and edit show pages styles
used captcha for confirming the signup
Added add_a_cameo, view_invitation and show_player pages and updated home page and dashboard pages to update links to other pages
Add Valdiations for User, Add Sign in count to user and redirecting user to getting started page, if user is logging in for the first time, Added links to home page shows list
Merge branch 'captcha_process' into development
Updated error messages for while creating user