modified:   ../../product-site_registration.xml
	modified:   site-registration/js/common.js
	modified:   site-registration/php/index.php
	modified:   ../../../../vb/includes/site-registration/css/styles.css
	modified:   ../../../../vb/includes/site-registration/js/common.js
	modified:   ../../../../vb/includes/site-registration/php/index.php
	modified:   site-registration/php/index.php
	modified:   ../../../../vb/includes/site-registration/php/index.php
Merge branch 'master' of github.com:MilkZoft/vbregistration

Conflicts:
	vb/includes/site-registration/css/styles.css
	vb/includes/site-registration/js/common.js
	vb/includes/site-registration/php/index.php

	modified:   ../../product-site_registration.xml
	modified:   site-registration/js/common.js
	modified:   site-registration/php/index.php
	new file:   ../../../../vb/includes/site-registration/bootstrap/css/bootstrap-dropdown.min.css
	new file:   ../../../../vb/includes/site-registration/bootstrap/css/bootstrap-fileupload.min.css
	new file:   ../../../../vb/includes/site-registration/bootstrap/css/bootstrap-tooltip.min.css
	new file:   ../../../../vb/includes/site-registration/bootstrap/js/bootstrap-dropdown.min.js
	new file:   ../../../../vb/includes/site-registration/bootstrap/js/bootstrap-fileupload.min.js
	new file:   ../../../../vb/includes/site-registration/bootstrap/js/bootstrap-tooltip.min.js
	new file:   ../../../../vb/includes/site-registration/css/styles.css~
	new file:   ../../../../vb/includes/site-registration/facebox/facebox.js~
	new file:   ../../../../vb/includes/site-registration/img/redx.png
	modified:   ../../../../vb/includes/site-registration/js/common.js
	new file:   ../../../../vb/includes/site-registration/js/common.js~
	new file:   ../../../../vb/includes/site-registration/js/jquery.form.js
	modified:   ../../../../vb/includes/site-registration/php/index.php
	new file:   ../../../../vb/includes/site-registration/php/index.php~