fixed
Merge branch 'master' of https://github.com/markvanhoscheid/bookshelf

Conflicts:
	Bookshelf.Web/Areas/Default/Views/Home/_ChartPartial.cshtml