no message
Merge branch 'master' of https://github.com/Team-Charlotte-Bronte/ASP-NET-Web-Forms-Teamwork-2014
Categories are now binded to the master page
Merge branch 'master' of https://github.com/Team-Charlotte-Bronte/ASP-NET-Web-Forms-Teamwork-2014

Conflicts:
	Bookie/Bookie.Web/Site.Master
Merge branch 'master' of https://github.com/Team-Charlotte-Bronte/ASP-NET-Web-Forms-Teamwork-2014

Conflicts:
	Bookie/Bookie.Web/Site.Master