Custom fields on products complete as well as working permalink structure for custom post types.
Merge branch 'master' of github.com:Fishgate/OIMGroup-WP

Conflicts:
	htdocs/wp-content/themes/OIM2013/functions.php
	htdocs/wp-content/themes/OIM2013/single-products_services.php