Resolved major merge conflicts.
Updated project with backward compatibility using ActionBarSherlock.
Enabled Proguard.
Committed missing files