master data for categories and promotions
Merge pull request #4 from linhnv/linh2

master data for categories and promotions
fix view with note: dont add application.css to layout
Merge pull request #5 from caothang14/thang

log in with phone number
fix temp and some link in thang's commit
fix bug of login by facebook and get publish_stream in omniauth