update 20140529


Change-Id: I3280cb79024941459f50515fc2b497dabeccf17f
Signed-off-by: Javier <javier.macro.trader@gmail.com>
Merge branch 'master' of https://github.com/RoadWarrior/AlgoRepo.git