large pic
fix newline
ui
Merge branch 'master' of https://github.com/YoDoLab/Frontend

Conflicts:
	generate_photos.php
	my.js