Merge branch 'master' of https://github.com/giux78/yalin

Conflicts:
	user_signup.html
fdsfs

fsdfsfs
Probably we have lost some modification

Probably we have lost some modification