2 commits

Author	SHA1	Message	Date
Mario Colque	92f4422841	fix conflicts	2014-03-31 18:05:35 -03:00
Gustavo Cortez	4cd48b7bb2	integrate new name and header. Signin/signout flow	2014-03-31 12:48:35 -03:00