Merged unity_build branch back to trunk.
Features:
Improvements:
no more file for command line options
Regressions: