Merge branch 'master' of https://github.com/maccabee0/ToDoList

Conflicts:
	ToDoList/ToDoList/Mappings/Item.hbm.xml
hibernate