minor 2 version login

with register
Merge branch 'master' of https://github.com/RedMojito/STAC2014_RedMojito