Some project updates
More project updates
Even more project updates
And more
fixing merge conflicts
Merge branch 'mele'