Stock (Update, View, Active - DeActive)
Merge branch 'origin/master'

Conflicts:
	StockSpaceWebApplication/src/main/java/com/stockspace/mappers/ProductMapper.java
	StockSpaceWebApplication/src/main/java/com/stockspace/services/ProductService.java
	StockSpaceWebApplication/src/main/webapp/WEB-INF/spring/db-context.xml
Integration Completed