Merge branch 'master' of https://github.com/digital-flowers/livejs

Conflicts:
	controllers/about.js
	modules/db.js
	modules/router.js
	node_modules/mysql/node_modules/bignumber.js/LICENCE
	node_modules/mysql/node_modules/bignumber.js/README.md
	node_modules/mysql/node_modules/bignumber.js/bignumber.js
	node_modules/mysql/node_modules/bignumber.js/doc/API.html
	node_modules/mysql/node_modules/bignumber.js/perf/README.txt
	node_modules/mysql/node_modules/bignumber.js/perf/bignumber-vs-bigdecimal.html
	node_modules/mysql/node_modules/bignumber.js/perf/bigtime-OOM.js
	node_modules/mysql/node_modules/bignumber.js/perf/bigtime.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/BigDecTest.java
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/LICENCE.txt
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/bigdecimal.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/bugs.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_ICU4J/BigDecimal-all-last.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_ICU4J/BigDecimal-all-last.min.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_ICU4J/LICENCE.txt
	node_modules/mysql/node_modules/bignumber.js/test/abs.js
	node_modules/mysql/node_modules/bignumber.js/test/base-in.js
	node_modules/mysql/node_modules/bignumber.js/test/base-out.js
	node_modules/mysql/node_modules/bignumber.js/test/browser/bignumber-vs-number.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/console-errors.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/every-test.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/quick-test.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/single-test.html
	node_modules/mysql/node_modules/bignumber.js/test/ceil.js
	node_modules/mysql/node_modules/bignumber.js/test/cmp.js
	node_modules/mysql/node_modules/bignumber.js/test/config.js
	node_modules/mysql/node_modules/bignumber.js/test/div.js
	node_modules/mysql/node_modules/bignumber.js/test/every-test.js
	node_modules/mysql/node_modules/bignumber.js/test/floor.js
	node_modules/mysql/node_modules/bignumber.js/test/minus.js
	node_modules/mysql/node_modules/bignumber.js/test/mod.js
	node_modules/mysql/node_modules/bignumber.js/test/neg.js
	node_modules/mysql/node_modules/bignumber.js/test/others.js
	node_modules/mysql/node_modules/bignumber.js/test/plus.js
	node_modules/mysql/node_modules/bignumber.js/test/pow.js
	node_modules/mysql/node_modules/bignumber.js/test/quick-test.js
	node_modules/mysql/node_modules/bignumber.js/test/round.js
	node_modules/mysql/node_modules/bignumber.js/test/sqrt.js
	node_modules/mysql/node_modules/bignumber.js/test/times.js
	node_modules/mysql/node_modules/bignumber.js/test/toExponential.js
	node_modules/mysql/node_modules/bignumber.js/test/toFixed.js
	node_modules/mysql/node_modules/bignumber.js/test/toFraction.js
	node_modules/mysql/node_modules/bignumber.js/test/toPrecision.js
	node_modules/mysql/node_modules/bignumber.js/test/toString.js
	node_modules/mysql/node_modules/bignumber.js/test/v8-LICENCE.txt
	node_modules/mysql/package.json
	node_modules/swig/HISTORY.md
	node_modules/swig/README.md
	node_modules/swig/dist/swig.js
	node_modules/swig/dist/swig.js.map
	node_modules/swig/dist/swig.min.js
	node_modules/swig/lib/parser.js
	node_modules/swig/lib/swig.js
	node_modules/swig/lib/tags/block.js
	node_modules/swig/lib/tags/set.js
	node_modules/swig/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/CHANGELOG.md
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/lib/source-map/array-set.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/lib/source-map/source-map-consumer.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/test/source-map/test-array-set.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/test/source-map/test-source-map-consumer.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/test/source-map/test-source-map-generator.js
	node_modules/swig/node_modules/uglify-js/package.json
	node_modules/swig/package.json
Merge branch 'master' of https://github.com/digital-flowers/livejs

Conflicts:
	controllers/about.js
	modules/db.js
	modules/router.js
	node_modules/mysql/node_modules/bignumber.js/LICENCE
	node_modules/mysql/node_modules/bignumber.js/README.md
	node_modules/mysql/node_modules/bignumber.js/bignumber.js
	node_modules/mysql/node_modules/bignumber.js/doc/API.html
	node_modules/mysql/node_modules/bignumber.js/perf/README.txt
	node_modules/mysql/node_modules/bignumber.js/perf/bignumber-vs-bigdecimal.html
	node_modules/mysql/node_modules/bignumber.js/perf/bigtime-OOM.js
	node_modules/mysql/node_modules/bignumber.js/perf/bigtime.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/BigDecTest.java
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/LICENCE.txt
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/bigdecimal.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_GWT/bugs.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_ICU4J/BigDecimal-all-last.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_ICU4J/BigDecimal-all-last.min.js
	node_modules/mysql/node_modules/bignumber.js/perf/lib/bigdecimal_ICU4J/LICENCE.txt
	node_modules/mysql/node_modules/bignumber.js/test/abs.js
	node_modules/mysql/node_modules/bignumber.js/test/base-in.js
	node_modules/mysql/node_modules/bignumber.js/test/base-out.js
	node_modules/mysql/node_modules/bignumber.js/test/browser/bignumber-vs-number.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/console-errors.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/every-test.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/quick-test.html
	node_modules/mysql/node_modules/bignumber.js/test/browser/single-test.html
	node_modules/mysql/node_modules/bignumber.js/test/ceil.js
	node_modules/mysql/node_modules/bignumber.js/test/cmp.js
	node_modules/mysql/node_modules/bignumber.js/test/config.js
	node_modules/mysql/node_modules/bignumber.js/test/div.js
	node_modules/mysql/node_modules/bignumber.js/test/every-test.js
	node_modules/mysql/node_modules/bignumber.js/test/floor.js
	node_modules/mysql/node_modules/bignumber.js/test/minus.js
	node_modules/mysql/node_modules/bignumber.js/test/mod.js
	node_modules/mysql/node_modules/bignumber.js/test/neg.js
	node_modules/mysql/node_modules/bignumber.js/test/others.js
	node_modules/mysql/node_modules/bignumber.js/test/plus.js
	node_modules/mysql/node_modules/bignumber.js/test/pow.js
	node_modules/mysql/node_modules/bignumber.js/test/quick-test.js
	node_modules/mysql/node_modules/bignumber.js/test/round.js
	node_modules/mysql/node_modules/bignumber.js/test/sqrt.js
	node_modules/mysql/node_modules/bignumber.js/test/times.js
	node_modules/mysql/node_modules/bignumber.js/test/toExponential.js
	node_modules/mysql/node_modules/bignumber.js/test/toFixed.js
	node_modules/mysql/node_modules/bignumber.js/test/toFraction.js
	node_modules/mysql/node_modules/bignumber.js/test/toPrecision.js
	node_modules/mysql/node_modules/bignumber.js/test/toString.js
	node_modules/mysql/node_modules/bignumber.js/test/v8-LICENCE.txt
	node_modules/mysql/package.json
	node_modules/swig/HISTORY.md
	node_modules/swig/README.md
	node_modules/swig/dist/swig.js
	node_modules/swig/dist/swig.js.map
	node_modules/swig/dist/swig.min.js
	node_modules/swig/lib/parser.js
	node_modules/swig/lib/swig.js
	node_modules/swig/lib/tags/block.js
	node_modules/swig/lib/tags/set.js
	node_modules/swig/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/CHANGELOG.md
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/lib/source-map/array-set.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/lib/source-map/source-map-consumer.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/test/source-map/test-array-set.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/test/source-map/test-source-map-consumer.js
	node_modules/swig/node_modules/uglify-js/node_modules/source-map/test/source-map/test-source-map-generator.js
	node_modules/swig/node_modules/uglify-js/package.json
	node_modules/swig/package.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.js