Merge pull request #25 from mkalb/develop

Reformat code
Checkstyle fixes
ImageBundle - Load images with BundleUtil
Merge remote-tracking branch 'movingblocks/develop' into develop