Merging branches
Merge branch 'master' of github.com:Fishgate/OIMGroup-WP

Conflicts:
	htdocs/wp-content/themes/OIM2013/footer.php
	htdocs/wp-content/themes/OIM2013/library/css/ie.css
	htdocs/wp-content/themes/OIM2013/library/css/style.css
Exported database again.