Develop

Synced master with develop and then merged the ublas/ublas develop in there. It should contain A LOT of changes but it is STABLE.

-Nasos