dev
Merge branch 'master' of https://github.com/xtazy/orchidee

Conflicts:
	src/Orchidee/FrontBundle/Resources/views/Default/home.html.php
	src/Orchidee/FrontBundle/Resources/views/Default/orchidee.html.php
	web/img/home_2.jpg
	web/img/orchidee_3.jpg
	web/img/orchidee_4.jpg
	web/img/orchidee_5.jpg
	web/img/orchidee_6.jpg
	web/img/orchidee_7.jpg
	web/img/orchidee_8.jpg