fix connections, fixed till IndexController.java
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
merge conflicts
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git