Day 1 of the Amsterdam conference
Merge remote-tracking branch 'origin/develop' into develop
First cut of the Atom feed builder
Improved Atom feed building and integrated site map into main build process
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/views/html/en/blog.html
Adding Amsterdam info
Merge remote-tracking branch 'origin/develop' into develop
Finalised the Atom feed
Added Amsterdam blog article and supporting images
Removed old event listings
added Atom feed to blog page
Merge branch 'develop'