Inte
[inté] - new layout
[inté] - new layout responsive
Inte
- new layout
- new layout responsive
tweak template, add missing address field
Cleanup
[AfsyFrontBundle] fixed wording.
[src] minor tweaks and refactoring.
fix layout
Merge branch 'migrate_to_sf2_3' of github.com:afsy/website into design

Conflicts:
	src/Afsy/Bundle/FrontBundle/Resources/views/Blog/_article.html.twig
	src/Afsy/Bundle/FrontBundle/Resources/views/footer.html.twig
	src/Afsy/Bundle/FrontBundle/Resources/views/header.html.twig
	src/Afsy/Bundle/FrontBundle/Resources/views/layout.html.twig
	web/css/global.css
	web/css/layout.css
	web/sass/global.scss
	web/sass/layout.scss
[inté] - fix merge