turista, is_approved added
Merge branch 'master' of https://github.com/MACS-Turista/Turista

Conflicts:
	WebContent/trip_view.jsp
	src/model/data/db/StaticStorage.java