update abs...
Merge branch 'master' of github.com:tverona/HoloEverywhere

Conflicts:
	contrib/ActionBarSherlock