refine the addproduct page..
Model.java would conflict..damn it
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	PBProject/src/cmu/TeamAxis/model/Model.java