Updated server message
Code cleaning
Added beacon keep alive message