added colorbox lightbox; added upload of images for products;
added listing of products when selecting categories on main page;
Merge branch 'master' of https://github.com/daniloKordic/fw1Test

Conflicts:
	layouts/default.cfm
	model/productService.cfc
	views/categories/default.cfm
	views/main/default.cfm
	views/products/manage.cfm