now uses android support libraries (supposed to work from 2.3 to 4.4)
Merge remote-tracking branch 'origin/master'