my branch
store models
Merge remote-tracking branch 'origin/huang' into song

Conflicts:
	CoffeeWebsite/CoffeeAdd.php
	CoffeeWebsite/Management.php
	CoffeeWebsite/Styles/Stylesheet.css
	CoffeeWebsite/nbproject/private/private.properties
	CoffeeWebsite/nbproject/private/private.xml
	StoreWebsite/Coffee.php
	StoreWebsite/Controller/CoffeeController.php
	StoreWebsite/Entities/CoffeeEntity.php
	StoreWebsite/Model/CoffeeModel.php
	StoreWebsite/Model/Credentials.php
	StoreWebsite/Template.php
	StoreWebsite/nbproject/project.properties
	StoreWebsite/nbproject/project.xml