Merged 'develop'.

Conflicts:
	app/views/layouts/_footer.html.erb