2014-0517 campos requeridos
Merge origin/master
2014-0518 login