made the Order Details page a bit more arranged
try to solve git conflict
Merge remote-tracking branch 'origin/Smaranda'

Conflicts:
model/control.js
model/db.js
Merge remote-tracking branch 'origin/Smaranda'

Conflicts:
	model/control.js
	model/db.js