Merge remote-tracking branch 'origin/master'

Conflicts:
	Frizza/templates/public_html/login.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	Frizza/templates/public_html/login.html
Merge remote-tracking branch 'origin/master'