Fixed Android version lower than 15 bug with the onClick item.
Fixed the fix of the problem
Merge branch 'master' into Database