v1
Merge branch 'master' of https://github.com/YoDoLab/Frontend
Merge branch 'master' of https://github.com/YoDoLab/Frontend

Conflicts:
	generate_photos.php
	my.js
fuck
final v1
Merge branch 'neal'

Conflicts:
	my.js
backup delete file
Merge branch 'master' of https://github.com/YoDoLab/Frontend