#25 Install fboauth, diff modules. Create a user_settings_feature. Add facebook links to users form
#25 - Login screen fix: pulled changes
#25 - Login screen fix: Merge branch 'prod' into task
#25 - Login screen fix: theming login page
#25 - Login screen fix: merge branch 'prod' into 25_task
Merge branch '25_task' into testing

Conflicts:
	sites/all/modules/custom/gfs_idevels/gfs_idevels.module
	sites/all/themes/lumi/styling/css/custom.css