Tarea para 12/10/2014

Signed-off-by: Luis G Ramirez Laurean <luis.g.ramirez.laurean@intel.com>
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from lgramire/master

Adding lgramire folder