merged nik/actionbar
Ignore the Eclipse .settings directory.
Merge commit 'dc14b1c432a7705e37b3613704bc2301f4b38e80' into actionbar