Merge branch 'develop' of https://github.com/akvo/akvo-web into develop

Conflicts:
code/wp-content/themes/Akvo-responsive/config.codekit
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
Merge branch 'develop' of https://github.com/akvo/akvo-web into develop

Conflicts:
	code/wp-content/themes/Akvo-responsive/config.codekit
	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