Draft
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/user.html
User rate
Easy solution for creating new markers
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/user.html
Format sources