Merge branch 'version/bump'

bump to dev version
Does not render label outside button
Merge branch 'bakura10-fix-3014' into develop