resolved a forgottn merge conflict
minor changes: refactoring and commenting
Added Actionbarsherlock Library