https
gemfile
Merge remote branch 'origin/master' into new_order

Conflicts:
	Gemfile.lock
	Highstock-1.2.2/examples/!FX/index.htm
	Highstock-1.2.2/examples/!FX/index2.htm
	Highstock-1.2.2/examples/area/index.htm
	Highstock-1.2.2/examples/arearange/index.htm
	Highstock-1.2.2/examples/areaspline/index.htm
	Highstock-1.2.2/examples/areasplinerange/index.htm
	Highstock-1.2.2/examples/basic-line/index.htm
	Highstock-1.2.2/examples/candlestick-and-volume/index.htm
	Highstock-1.2.2/examples/candlestick/index.htm
	Highstock-1.2.2/examples/candlestick/index2.htm
	Highstock-1.2.2/examples/column/index.htm
	Highstock-1.2.2/examples/columnrange/index.htm
	Highstock-1.2.2/examples/compare/index.htm
	Highstock-1.2.2/examples/dynamic-update/index.htm
	Highstock-1.2.2/examples/flags-general/index.htm
	Highstock-1.2.2/examples/flags-placement/index.htm
	Highstock-1.2.2/examples/flags-shapes/index.htm
	Highstock-1.2.2/examples/intraday-area/index.htm
	Highstock-1.2.2/examples/intraday-candlestick/index.htm
	Highstock-1.2.2/examples/lazy-loading/index.htm
	Highstock-1.2.2/examples/line-markers/index.htm
	Highstock-1.2.2/examples/markers-only/index.htm
	Highstock-1.2.2/examples/navigator-disabled/index.htm
	Highstock-1.2.2/examples/ohlc/index.htm
	Highstock-1.2.2/examples/scrollbar-disabled/index.htm
	Highstock-1.2.2/examples/spline/index.htm
	Highstock-1.2.2/examples/step-line/index.htm
	Highstock-1.2.2/examples/styled-scrollbar/index.htm
	Highstock-1.2.2/examples/yaxis-plotbands/index.htm
	Highstock-1.2.2/examples/yaxis-plotlines/index.htm
	Highstock-1.2.2/examples/yaxis-reversed/index.htm
	Highstock-1.2.2/exporting-server/java/highcharts-export/pom.xml
	Highstock-1.2.2/exporting-server/java/highcharts-export/src/main/java/com/highcharts/export/controller/ExportController.java
	Highstock-1.2.2/exporting-server/java/highcharts-export/src/main/java/com/highcharts/export/controller/ExportController.java.bak
	Highstock-1.2.2/exporting-server/java/highcharts-export/src/main/java/com/highcharts/export/filters/DefaultEncodingFilter.java
	Highstock-1.2.2/exporting-server/java/highcharts-export/src/main/webapp/WEB-INF/web.xml
	Highstock-1.2.2/exporting-server/java/install.txt
	Highstock-1.2.2/exporting-server/php/index-with-imagick.php
	Highstock-1.2.2/exporting-server/php/index.php
	Highstock-1.2.2/index.htm
	Highstock-1.2.2/js/highstock.js
	Highstock-1.2.2/js/highstock.src.js
	Highstock-1.2.2/js/modules/canvas-tools.js
	Highstock-1.2.2/js/modules/canvas-tools.src.js
	Highstock-1.2.2/js/modules/data.src.js
	Highstock-1.2.2/js/modules/exporting.js
	Highstock-1.2.2/js/modules/exporting.src.js
	README
	app/assets/fonts/ptsans.svg
	app/assets/javascripts/application.js
	app/assets/javascripts/bootstrap.js
	app/assets/javascripts/bootstrap.min.js
	app/assets/javascripts/customer.js.coffee
	app/assets/javascripts/flexslider.js
	app/assets/javascripts/flipcounter.js
	app/assets/javascripts/highstock.js
	app/assets/javascripts/infobubble.js
	app/assets/javascripts/iscroll.js
	app/assets/javascripts/jquery.isotope.min.js
	app/assets/javascripts/settings.js.coffee
	app/assets/stylesheets/bootstrap.css
	app/assets/stylesheets/bootstrap.min.css
	app/assets/stylesheets/coming-soon.css
	app/assets/stylesheets/customer.css.scss
	app/assets/stylesheets/lib/animate.css
	app/assets/stylesheets/lib/flexslider.css
	app/assets/stylesheets/ptsans.svg
	app/assets/stylesheets/settings.css.scss
	app/assets/stylesheets/sign-in.css
	app/assets/stylesheets/um/accounts.css.scss
	app/assets/stylesheets/um/bootstrap_and_overrides.css.less
	app/assets/stylesheets/um/faq_categories.css.scss
	app/assets/stylesheets/um/faq_items.css.scss
	app/assets/stylesheets/um/welcome.css
	app/helpers/application_helper.rb
	app/views/customers/pay.html.haml
	app/views/layouts/accounts.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/application.mobile.erb
	app/views/layouts/orders.html.erb
	app/views/layouts/welcome.html.erb
	app/views/welcome/_top_menu.erb
	clean_canvas/README.txt
	clean_canvas/about-us.html
	clean_canvas/backgrounds.html
	clean_canvas/blog.html
	clean_canvas/blogpost.html
	clean_canvas/coming-soon.html
	clean_canvas/contact.html
	clean_canvas/css/bootstrap.css
	clean_canvas/css/bootstrap.min.css
	clean_canvas/css/lib/animate.css
	clean_canvas/css/lib/flexslider.css
	clean_canvas/css/ptsans.svg
	clean_canvas/features.html
	clean_canvas/index.html
	clean_canvas/js/bootstrap.js
	clean_canvas/js/bootstrap.min.js
	clean_canvas/js/flexslider.js
	clean_canvas/js/jquery.isotope.min.js
	clean_canvas/portfolio-item.html
	clean_canvas/portfolio.html
	clean_canvas/pricing.html
	clean_canvas/reset.html
	clean_canvas/services.html
	clean_canvas/sign-in.html
	clean_canvas/sign-up.html
	public/ptsans.svg
	public/robots.txt
	test/fixtures/accounts.yml
	test/fixtures/card_payments.yml
	test/fixtures/faq_categories.yml
	test/fixtures/faq_items.yml
	test/fixtures/systems.yml
Merge pull request #11 from Bedunkevich/new_order

https