Update 05/05/14

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