merge conflict
Merge remote-tracking branch 'origin/bdlogin' into bdlogin
Merge remote-tracking branch 'origin/bdlogin' into bdlogin
removed suppress warnings for honeycone and changed api level to 11