Test for register page resolved, now in green
Merge branch 'dev' of github.com:DSI-ETSII-ULL/PosImposible into tests
More User tests in alpha stage and Travis added
A user object has all attributes tests added, changed django to v1.5.1
Improved test for scenario user has all atributes
more test for user
Refined tests for user registering, alpha test for user loggin
Work In Progress for A user is loging
Work in progres tests for user settings
merging conflict dev/tests resolved
Merge branch 'dev' of github.com:DSI-ETSII-ULL/PosImposible into dev
Merge branch 'dev' of github.com:DSI-ETSII-ULL/PosImposible into dev
Merge rama remota dev en rama local
Merge dev local con remota
Merge branch 'dev' of github.com:DSI-ETSII-ULL/PosImposible into dev