Merge branch 'devel' into integration
JS : iphone scroller
Merge branch 'devel' into integration

Conflicts:
	apps/landing/templates/landing/v2.html
	templates/inc/header.html
Landing page

- add iphone carousel
- vimeo embed