Updating eclipse project references
Merge branch 'nn'