added actionbarsherlock
cleaned merge