3.6 beta

Fixes for Lollipop

git-svn-id: http://sipdroid.googlecode.com/svn/trunk@683 8b64e154-0f13-11de-9106-f38757f67524