merge rc6 development stuff

localization issues and licensing clean up