bd_17_11_2014
Merge branch 'nuevabd'