order details changes
Merge branch 'master' of https://github.com/Live-Oak/FlipKartOOAD.git

Conflicts:
	src/edu/iiitb/database/DBHandlerForMyOrders.java
Merge branch 'master' of https://github.com/Live-Oak/FlipKartOOAD.git

Conflicts:
	src/struts.xml