2014-01-13: reparing flag file
2014-01-13: repairing the flag file
Merge branch 'integration'