Web Boostrap (LOGIN) error Cookies
sql
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sql/blacks-data.sql