merged dev with authlogic