BITACORA AVANCE 09 SEP 2014
Merge origin/master