PostgreSQL
Merge remote-tracking branch 'origin/prototype' into prototype

Conflicts:
	pom.xml
	src/main/java/timetable/beans/editBeans/AddRoomBean.java
	src/main/webapp/META-INF/context.xml
	src/main/webapp/WEB-INF/web.xml