Untracked gen and bin, added blank line in ConversationsActivity to get
eclipse to commit this.