modified:   vBulletinPlugins/Site Registration/product-site_registration.xml
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/bootstrap/js/bootstrap-fileupload.min.js
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/js/common.js
	deleted:    vBulletinPlugins/Site Registration/upload/includes/site-registration/js/common.js~
    modified:   vb/includes/site-registration/bootstrap/js/bootstrap-fileupload.min.js
	modified:   vb/includes/site-registration/js/common.js
	deleted:    vb/includes/site-registration/js/common.js~
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/bootstrap/js/bootstrap-fileupload.min.js
	modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/js/common.js
	modified:   vb/includes/site-registration/bootstrap/js/bootstrap-fileupload.min.js
    modified:   vb/includes/site-registration/js/common.js
Merge branch 'master' of github.com:MilkZoft/vbregistration
	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/php/index.php
    modified:   vBulletinPlugins/Site Registration/upload/includes/site-registration/php/site_registration_functions.php
	modified:   vb/includes/site-registration/js/common.js
	modified:   vb/includes/site-registration/php/index.php
	modified:   vb/includes/site-registration/php/site_registration_functions.php
	new file:   vBulletinPlugins/Site Registration/upload/includes/site-registration/css/custom_fields.css
	new file:   vBulletinPlugins/Site Registration/upload/includes/site-registration/php/custom_fields.php
	new file:   vb/includes/site-registration/css/custom_fields.css
    new file:   vb/includes/site-registration/php/custom_fields.php
Merge branch 'master' of github.com:MilkZoft/vbregistration

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

Conflicts:
	vBulletinPlugins/Site Registration/upload/includes/site-registration/php/index.php
	vb/includes/site-registration/php/index.php