Cleaning up image directory, combining icons into a single sprite
Merge branch 'develop'