added ability to add version number overlay to app icon during build
Merge branch 'master' into build_no_on_icon

Conflicts:
	modules/bump_version_module.rb