Bug fixes and other stuff
Merge branch 'master' of https://github.com/webdude21/Shop.NET.git