commit fro search engine
Merge branch 'master' of github.com:game2share/web

Conflicts:
	src/G2s/AppBundle/Resources/config/routing.yml
add images
merge finished plus add pics