Wipe repository for major updates merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	LICENSE
	config/chinese/config.xml
	config/japanese/config.xml
	favicon.png
	framework/bootstrap/components/switch/css/bootstrap-switch.css
	framework/bootstrap/components/switch/js/bootstrap-switch.min.js
	framework/bootstrap/css/default.css
	framework/bootstrap/fonts/glyphicons-halflings-regular.eot
	framework/bootstrap/fonts/glyphicons-halflings-regular.svg
	framework/bootstrap/fonts/glyphicons-halflings-regular.ttf
	framework/bootstrap/fonts/glyphicons-halflings-regular.woff
	framework/bootstrap/js/bootstrap.min.js
	framework/css/font-awesome.css
	framework/csslintrc.json
	framework/fonts/FontAwesome.otf
	framework/fonts/fontawesome-webfont.eot
	framework/fonts/fontawesome-webfont.svg
	framework/fonts/fontawesome-webfont.ttf
	framework/fonts/fontawesome-webfont.woff
	framework/js/libs/backbone-1.1.2.min.js
	framework/js/libs/jasmine-2.0.1.js
	framework/js/libs/jasmine.html-2.0.1.js
	framework/js/libs/jquery-1.11.1.min.js
	framework/js/libs/requirejs-2.1.14.min.js
	framework/js/libs/requirejs.i18n-2.0.4.js
	framework/js/libs/requirejs.text-2.0.12.js
	icon-128x128.png
	icon-16x16.png
	icon-196x196.png
	package.json
	www/js/app/Strokes.js
	www/js/app/workers/MergeObjectArray.js
	www/js/libs/createjs.tween-NEXT.min.js
	yuidoc/assets/vendor/prettify/COPYING
Finish wiping remaining files for major update