Fixed file .gitignore
Merge branch 'master' of https://github.com/WatchWeb/Project

Conflicts:
	Watch/WebRoot/WEB-INF/classes/admin/admin_spring.xml
	Watch/WebRoot/WEB-INF/classes/admin/admin_struts.xml
	Watch/WebRoot/WEB-INF/classes/bean/Admin.class
	Watch/WebRoot/WEB-INF/classes/bean/Brand.class
	Watch/WebRoot/WEB-INF/classes/bean/Brand.hbm.xml
	Watch/WebRoot/WEB-INF/classes/bean/Product.class
	Watch/WebRoot/WEB-INF/classes/bean/Series.class
	Watch/WebRoot/WEB-INF/classes/dao/IBrandDao.class
	Watch/WebRoot/WEB-INF/classes/dao/IProductDao.class
	Watch/WebRoot/WEB-INF/classes/dao/impl/BrandDaoImpl.class
	Watch/WebRoot/WEB-INF/classes/dao/impl/ProductDaoImpl.class
	Watch/WebRoot/WEB-INF/classes/hibernate.cfg.xml
	Watch/WebRoot/WEB-INF/classes/home/home_spring.xml
	Watch/WebRoot/WEB-INF/classes/home/home_struts.xml
	Watch/WebRoot/WEB-INF/classes/search/Test.class
	Watch/WebRoot/WEB-INF/classes/search/search_spring.xml
	Watch/WebRoot/WEB-INF/classes/search/search_struts.xml
	Watch/WebRoot/WEB-INF/classes/user/action/xxAction.class