Merge "Added SIP Demo to sample apps." into gingerbread