Change in Login
Merge branch 'master' of https://code.google.com/p/upm-oset

Conflicts:
	application/views/set/LAB_SET_view.php
	application/views/set/UP_SET_view.php