Order updating for user. Not yet working 100%. Problems in DAO
parameters.
Merge remote-tracking branch 'origin/master'