Added .project file to versioning
Merge branch 'master' into actionbarsherlock_integration