Trunk

merge to master, login and some sontacts done