Changed Captha key
Merge branch 'master' of https://github.com/nezbo/sas
Added dropdown to select friendshiptype in findFriends.xhtml. The actually adding a friend is not functioning yet
Merge branch 'master' of https://github.com/nezbo/sas