SimpleParser: refactor token attribute
RMSE: bug in per user computation
RMSE: added different strategies

Fixed updating the number of user items, which was never updated before
Merge remote-tracking branch 'upstream/master'