Day 1 of the Amsterdam conference
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/views/html/en/blog.html
Adding Amsterdam info