photo random
Merge branch 'master' of https://github.com/Kureb/Marathon

Conflicts:
	modele_theme.php
Merge branch 'master' of https://github.com/Kureb/Marathon