Merge branch 'release/1.1.0' of https://github.com/akvo/akvo-web
Merge branch 'release/1.1.1' of https://github.com/akvo/akvo-web
Help and support
Fix Akvopedia content
Merge release 1.1.1 (commit '4cfc9120916bd422f1746dc7335e45e65e3ce559') into fix/help_remerge

Conflicts resolved in:
	code/wp-content/themes/Akvo-responsive/css/main.css
	code/wp-content/themes/Akvo-responsive/css/main.scss
[#64] Removed generated main.css.map file.
[#64] Removed generated codekit file.
Fixed logos on help pages

Resolved conflicts for:
	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
[#226][#225][#241] Updated Help and support

Resolved conflicts in:
	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 'fix/help_remerge' of https://github.com/akvo/akvo-web into fix/develop_remerge

Resolved conflicts in:
	code/wp-content/themes/Akvo-responsive/css/main.css
	code/wp-content/themes/Akvo-responsive/css/main.scss
	code/wp-content/themes/Akvo-responsive/images/rsrUpscreengrab-2.jpg
	code/wp-content/themes/Akvo-responsive/images/rsrUpscreengrab-3.jpg
	code/wp-content/themes/Akvo-responsive/images/rsrUpscreengrab-4.jpg
	code/wp-content/themes/Akvo-responsive/images/rsrUpscreengrab-5.jpg
	code/wp-content/themes/Akvo-responsive/networkPage.php