Basically 1) A few minor code suggestions and 2) M...

# kobalt

[cedric]

Basically 1) A few minor code suggestions and 2) Merge the two build files in one big one at the root of the project