commit to get latest changes
Merge branch 'master' of https://github.com/andrewhaw/digitaltapestry-web

Conflicts:
	index.php