added smack model and controller
fixed merge error