Login .java and .xml by German Ostaszynski
merge commit