- Login -> AdminPanel, UserPanel
- database.sql - > Dodanie kolumny Typ_logowania + drobne zmiany
Merge branch 'master' into sebek

Conflicts:
	aquadrom.sql
	aquadrom.v11.suo