Andy Initial Change

Andy's initial changes.
proguard-project text