Started working on thread model/dao
Merge branch 'develop' of https://github.com/knutesten/kad into develop

Conflicts:
	src/main/resources/i18n.properties
	src/main/webapp/WEB-INF/faces-config.xml