gsdg
Merge branch 'master' of https://github.com/MACS-Turista/Turista

Conflicts:
	src/model/data/db/DBConnection.java
admin regUsers added, approvement added
Merge branch 'master' of https://github.com/MACS-Turista/Turista
stuff
Merge branch 'master' of https://github.com/MACS-Turista/Turista

Conflicts:
	src/listeners/ContextListener.java
	src/model/data/db/HotelStorage.java
	src/model/data/db/StaticStorage.java
	src/model/data/users/Sellers.java
	src/model/data/users/User.java