Merge branch 'develop'

Conflicts:
	css/custom.css
	videos.html
	why.html
fix responsive

----------- (reverted from commit 7b008275b79d69cb6d17b15b78111229c5affc23) (reverted from commit 740e91251820aef24836d81cfb21e3ca16dc696a)
fix
Merge branch 'oconne'

Conflicts:
	why.html