31/05/2014 - 16h27
Merge branch 'master' of https://github.com/Jotune/Cubbyhole

Conflicts:
	cubbyhole_asp/cubbyhole_asp/Database.Designer.cs
	cubbyhole_asp/cubbyhole_asp/Database.edmx.diagram