modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/js/common.js
	modified:   vb/includes/site-registration/js/common.js
Merge branch 'master' of github.com:MilkZoft/vbregistration

Conflicts:
	vBulletinPlugins/Site Registration/upload/includes/site-registration/js/common.js

	deleted:    1
	modified:   vBulletinPlugins/Site Registration/product-site_registration.xml
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/js/common.js
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/js/jquery.form.js
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/js/md5.js
	modified:   vb/includes/site-registration/js/jquery.form.js
    modified:   vb/includes/site-registration/js/md5.js