added twitter auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/users/Bootstrap.php