Merge pull request #36 from Thatdot7/master

ActionBarSherlock added
Update project.properties
ABS premerge 2
Merge remote-tracking branch 'upstream/master'
Pre-merge commit 3