Merge "Added SIP Demo" into gingerbread