pm 1.1

Signed-off-by: fpumir <fpumir@terredeweb.fr>
Merge branch 'master' of https://github.com/ecolehetic/leap

Signed-off-by: fpumir <fpumir@terredeweb.fr>

Conflicts:
	app/Controllers/App_controller.php
	app/Models/App.php
	app/Views/investors.html
	app/Views/leadership.html
	app/Views/news.html
	app/Views/our_story.html