Added PaperType
Merge branch 'master' of https://github.com/tdelev/web-proceedings.git

Conflicts:
	src/main/java/org/ictact/webproceedings/model/Conference.java
	src/main/webapp/WEB-INF/jsp/index.jsp