code in sunday 061013
merge Auth component