login update
login update
Merge origin/master

Conflicts:
	admin/login.php
	nbproject/private/private.xml
Added TableSong + Brani
Added TableSong + Brani