minor changes
Merge branch 'master' of https://github.com/itaishmida/BookAchoy

Conflicts:
	application/views/friends.php
improved login display, no more fake users!