- merge conflict
- updated database
Merge branch 'development'

Conflicts:
	admin/admin.php
	admin/category/add.php
	admin/category/edit.php
	admin/footer.php
	admin/header.php
	admin/index.php
	admin/menu/add.php
	admin/menu/delete.php
	admin/menu/edit.php
	admin/menu/menu.php
	admin/product/add.php
	admin/product/edit.php
	admin/user/add.php
	admin/user/edit.php
	admin/user/user.php
	css/master.css
	database/database (old).png
	database/database.mwb
	database/database.png
	database/database.sql
	header.php
	inc/links.inc.php
	inc/queries.php
	labour.php
- Image Upload
Added product image to the edit page (incomplete)
Fixed a lot of bugs in the edit page of products
- removed some stuff
- database exported working with current repo
- web.config
Fixed edit product page