Merged code from last release
Merged latest changes from old svn trunk
Removed svn-id from file and fixed bug that counted warnings as errors.
Merge pull request #2 from lbl-srg/develop

Merged develop branch to master