Hotdeal / Tip new models / controller / view
Conflicts resovled