sss
Merge branch 'master' of https://github.com/agence2/site-agence

Conflicts:
	panoreyes_in_english.ppt