version al 21/9/14
traigo master
Merge branch 'master' of https://github.com/tmarcote/jsconfApp-test