Merge "Removing some eclipse warnings" into ub-launcher3-master