Display orgAndPLace
Merge branch 'develop' into feature/171-akvorsrup

Conflicts:
	code/wp-content/themes/Akvo-responsive/css/main.css
	code/wp-content/themes/Akvo-responsive/css/main.css.map
	code/wp-content/themes/Akvo-responsive/css/main.scss