testing
separated demos branch from master
organized files
structures demos
removed php support
added d3 demos
Added demos
added demos
Updates
Updates
Updates
Updates
Updates
Updates
Updates
Updates
Merge branch 'experiments' into conf

Conflicts:
	.tmp/styles/ie7.css
	.tmp/styles/ie8.css
	.tmp/styles/magnific-popup.css
	canvas-paper/css/main.css
	canvas-paper/css/normalize.css
	canvas-paper/js/plugins.js
	canvas-paper/js/vendor/jquery-1.10.2.min.js
	canvas-paper/js/vendor/modernizr-2.6.2.min.js
	d3-forcelayout/images/person1.png
	d3-forcelayout/images/person1_16.png
	d3-forcelayout/images/person2.png
	d3-forcelayout/images/person2_16.png
	d3-forcelayout/images/person3.png
	d3-forcelayout/images/person3_16.png
	d3-forcelayout/images/person4.png
	d3-forcelayout/images/person4_16.png
	d3-forcelayout/images/person5.png
	d3-forcelayout/images/person5_16.png
	d3-forcelayout/js/common.js
	d3-forcelayout/js/d3.v3.min.js
	d3-forcelayout/json/Adam.json
	d3-forcelayout/json/Alex.json
	d3-forcelayout/json/Alma.json
	d3-forcelayout/json/George.json
	d3-forcelayout/json/Linda.json
	d3-forcelayout/json/persons.json
	d3-svg/assets/06 - Subhanallah.mp3
	d3-svg/assets/06_Subhanallah.ogg
	d3-svg/assets/1298128593.png
	d3-svg/assets/Beautiful Sound of The Ocean.mp3
	d3-svg/assets/Beautiful_Sound_of_The_Ocean.ogg
	d3-svg/assets/Mockingbird_silhouette.png
	d3-svg/assets/blue-fish.png
	d3-svg/assets/johnny_automatic_Cincinnati_Skyline.png
	d3-svg/img/clear_sky-subtle_light_blue_texture.jpg
	d3-svg/js/d3.v3.min.js
	d3-svg/js/main.js
	history/1.jpg
	history/2.jpg
	history/3.jpg
	index.html
	jkefexMultiSortSel/css/bootstrap.min.css
	select-check-box/css/bootstrap-responsive.min.css
	select-check-box/css/bootstrap.css
	select-check-box/css/starter-template.css
	select-check-box/img/glyphicons-halflings-white.png
	select-check-box/img/glyphicons-halflings.png
	select-check-box/js/angular.min.js
	select-check-box/js/bootstrap.min.js
	select-check-box/js/msel/controllers/mainController.js
	videojs/dooriyan.ogv
	webaudio/Violan.mp3
	webfilters/img/pic.jpg
	workers/js/workerdemo.js
	yoangular/app/404.html
	yoangular/node_modules/grunt-contrib-connect/node_modules/connect/node_modules/formidable/test/fixture/file/blank.gif