Update Live Server2
Merge branch 'master' of https://github.com/AnthonyHunt/leihs

Conflicts:
	db/schema.rb
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/ffi-1.9.3/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/gherkin-2.12.0/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/json-1.8.0/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/mysql2-0.3.13/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/nokogiri-1.6.0/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/redcarpet-3.0.0/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/therubyracer-0.11.4/gem_make.out
	vendor/bundle/ruby/1.9.1/extensions/x86_64-linux/1.9.1/websocket-driver-0.3.0/gem_make.out
	vendor/bundle/ruby/1.9.1/gems/ffi-1.9.3/ext/ffi_c/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_ar/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_bg/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_bm/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_ca/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_cs/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_cy_gb/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_da/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_de/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_el/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en_au/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en_lol/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en_old/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en_pirate/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en_scouse/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_en_tx/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_eo/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_es/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_et/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_fa/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_fi/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_fr/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_gl/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_he/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_hi/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_hr/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_hu/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_id/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_is/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_it/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_ja/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_ko/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_lt/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_lu/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_lv/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_nl/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_no/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_pl/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_pt/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_ro/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_ru/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_sk/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_sr_cyrl/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_sr_latn/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_sv/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_tl/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_tr/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_tt/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_uk/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_uz/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_vi/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_zh_cn/Makefile
	vendor/bundle/ruby/1.9.1/gems/gherkin-2.12.0/ext/gherkin_lexer_zh_tw/Makefile
	vendor/bundle/ruby/1.9.1/gems/json-1.8.0/ext/json/ext/generator/Makefile
	vendor/bundle/ruby/1.9.1/gems/json-1.8.0/ext/json/ext/parser/Makefile
	vendor/bundle/ruby/1.9.1/gems/mysql2-0.3.13/ext/mysql2/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/config.log
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/config.status
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/doc/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/doc/devhelp/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/doc/examples/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/example/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/include/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/include/libxml/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/libtool
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/libxml2.spec
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/python/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/python/tests/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxml2/2.8.0/libxml2-2.8.0/xstc/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/config.log
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/config.status
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/doc/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/libexslt/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/libtool
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/libxslt.spec
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/libxslt/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/python/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/python/tests/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/REC/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/REC1/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/REC2/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/XSLTMark/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/docbook/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/docs/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/documents/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/common/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/date/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/dynamic/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/functions/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/math/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/sets/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/exslt/strings/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/extensions/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/general/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/keys/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/multiple/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/namespaces/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/numbers/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/plugins/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/reports/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/xinclude/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/tests/xmlspec/Makefile
	vendor/bundle/ruby/1.9.1/gems/nokogiri-1.6.0/ext/nokogiri/tmp/x86_64-linux-gnu/ports/libxslt/1.1.26/libxslt-1.1.26/xsltproc/Makefile
	vendor/bundle/ruby/1.9.1/gems/redcarpet-3.0.0/ext/redcarpet/Makefile
	vendor/bundle/ruby/1.9.1/gems/therubyracer-0.11.4/ext/v8/Makefile
	vendor/bundle/ruby/1.9.1/gems/websocket-driver-0.3.0/ext/websocket_mask/Makefile