first commit - fixed build errors
Merge https://github.com/Thapelo-Tsotetsi/actionbarsherlockcustom

Conflicts:
	README.md