Rename ant files so they don't overwrite possible existing files
Copy existing metafiles to payload instead of creating new ones
Remove SFtemp.zip and construct project structure instead

Moved build files and package.xml to root directory,
and eliminated SFtemp.zip folder. This allows to keep
version control of the build files.
Fix typo when referring iForce_build.properties
Pretty format iForce_build.xml
Merge pull request #1 from pventurino/copy_existing_metafile

Copy existing metafiles to payload instead of creating new ones
resolved conflicts
Fix merge gone wrong, ant calls still look for build.xml
Merge pull request #3 from pventurino/fix_ant_calls

Fix merge gone wrong, ant calls still look for build.xml
Merge branch 'incoming-updates'