update
Merge branch 'master' of https://github.com/leonluocheng/Pizza

Conflicts:
	PizzaAnonymousSystem/PizzaRepository/App_Data/PizzaDB.sdf
Merge branch 'master' of https://github.com/leonluocheng/Pizza.git