Edited .gitmodules to ignore changes to the submodule directory
Added ActionBarSherlock as a library module and facet to resolve build errors.
This is a test for creating a changelist other than default. Also attempting to preserve .gitmodules file which will be clobbered with merge as it is currently untracked.
Merge remote-tracking branch 'origin/master'