merge authlogic branch into dev