File structure changes for images
Merge branch 'master' of https://github.com/tomdavison12/AMPL-Publishing

Conflicts:
	includes/functions.php