iets
Merge branch 'master' of https://github.com/Jveenstra1988/editall

Conflicts:
	inc/works-content.php