Merge branch 'phonegap3-toolbartweak' into phonegap3-custom