Syncing Up Changes
Merge branch 'master' of https://github.com/hwproductionco/ReferralClix_Version2

Conflicts:
	advocates_profile.html
	assets2/.DS_Store
	assets2/css/custom.css
	assets2/css/lib/bootstrap-responsive.min.css
	assets2/css/lib/bootstrap.min.css
	assets2/img/glyphicons-halflings-white.png
	assets2/img/glyphicons-halflings.png
	assets2/js/.DS_Store
	assets2/js/app.js
	assets2/js/collections/my-form-snippets.js
	assets2/js/collections/snippets.js
	assets2/js/data/buttons.json
	assets2/js/data/input.json
	assets2/js/data/radio.json
	assets2/js/data/select.json
	assets2/js/data/yaml/buttons.yaml
	assets2/js/data/yaml/input.yaml
	assets2/js/data/yaml/parse.rb
	assets2/js/data/yaml/radio.yaml
	assets2/js/data/yaml/select.yaml
	assets2/js/helper/pubsub.js
	assets2/js/lib/backbone.js
	assets2/js/lib/bootstrap.js
	assets2/js/lib/build.js
	assets2/js/lib/jquery.js
	assets2/js/lib/require.js
	assets2/js/lib/text.js
	assets2/js/lib/underscore.js
	assets2/js/main-built.js
	assets2/js/main.js
	assets2/js/models/snippet.js
	assets2/js/r.js
	assets2/js/templates/.DS_Store
	assets2/js/templates/app/about.html
	assets2/js/templates/app/render.html
	assets2/js/templates/app/renderform.html
	assets2/js/templates/app/tab-nav.html
	assets2/js/templates/app/temp.html
	assets2/js/templates/popover/popover-checkbox.html
	assets2/js/templates/popover/popover-input.html
	assets2/js/templates/popover/popover-main.html
	assets2/js/templates/popover/popover-select.html
	assets2/js/templates/popover/popover-textarea-split.html
	assets2/js/templates/popover/popover-textarea.html
	assets2/js/templates/snippet/appendedcheckbox.html
	assets2/js/templates/snippet/appendedtext.html
	assets2/js/templates/snippet/button.html
	assets2/js/templates/snippet/buttondouble.html
	assets2/js/templates/snippet/buttondropdown.html
	assets2/js/templates/snippet/filebutton.html
	assets2/js/templates/snippet/formname.html
	assets2/js/templates/snippet/multiplecheckboxes.html
	assets2/js/templates/snippet/multiplecheckboxesinline.html
	assets2/js/templates/snippet/multipleradios.html
	assets2/js/templates/snippet/multipleradiosinline.html
	assets2/js/templates/snippet/passwordinput.html
	assets2/js/templates/snippet/prependedcheckbox.html
	assets2/js/templates/snippet/prependedtext.html
	assets2/js/templates/snippet/searchinput.html
	assets2/js/templates/snippet/selectbasic.html
	assets2/js/templates/snippet/selectmultiple.html
	assets2/js/templates/snippet/snippet-templates.js
	assets2/js/templates/snippet/textinput.html
	assets2/js/views/my-form-snippet.js
	assets2/js/views/my-form.js
	assets2/js/views/snippet.js
	assets2/js/views/tab-snippet.js
	assets2/js/views/tab.js
	assets2/js/views/temp-snippet.js
	configure_buy_x_get_free_campaign.html
	configure_buy_x_get_free_campaign_auto_trigger.html
	configure_buy_x_get_free_campaign_depreciation.html
	configure_buy_x_promotion.html
	configure_earn_per_event_campaign.html
	configure_event_campaign.html
	configure_gift_card_auto_trigger.html
	configure_gift_card_campaign.html
	configure_gift_card_depreciation.html
	configure_points_auto_trigger.html
	configure_points_campaign.html
	configure_points_depreciation.html
	configure_points_program.html
	configure_points_program_depreciation.html
	configure_points_promotions.html
	configure_points_recurring_fee.html
	configure_points_rewards.html
	css/custom.css
	dashboard2.html
	form_builder.html
	img/RCI_logo.jpg
	img/default_profile_image.gif
	img/donutChart.png
	js/app.js