s

s
Merge branch 'master' of https://github.com/retryu/CloudContact2

Conflicts:
	gen/com/actionbarsherlock/R.java