modified:   view.pt
Merge branch 'master' of http://github.com/lukebrannon/collective.fliptiles

Conflicts:
	collective/fliptiles/flipfolder_templates/view.pt
	modified:   flipfolder_templates/view.pt
	modified:   configure.zcml
	modified:   flipfolder_templates/view.pt
	new file:   profiles/default/jsregistry.xml
	new file:   resources/flipper.js
	new file:   resources/flippy_files/README.md
	new file:   resources/flippy_files/css/help.png
	new file:   resources/flippy_files/css/magnifier.png
	new file:   resources/flippy_files/css/page_white_code.png
	new file:   resources/flippy_files/css/page_white_copy.png
	new file:   resources/flippy_files/css/printer.png
	new file:   resources/flippy_files/css/shCore.css
	new file:   resources/flippy_files/css/shThemeDefault.css
	new file:   resources/flippy_files/css/shThemeDjango.css
	new file:   resources/flippy_files/css/shThemeEclipse.css
	new file:   resources/flippy_files/css/shThemeEmacs.css
	new file:   resources/flippy_files/css/shThemeFadeToGrey.css
	new file:   resources/flippy_files/css/shThemeMidnight.css
	new file:   resources/flippy_files/css/shThemeRDark.css
	new file:   resources/flippy_files/demo.css
	new file:   resources/flippy_files/demo.js
	new file:   resources/flippy_files/howto.html
	new file:   resources/flippy_files/jquery.flippy.js
	new file:   resources/flippy_files/jquery.flippy.min.js
	new file:   resources/flippy_files/js/excanvas.min.js
	new file:   resources/flippy_files/js/shBrushJScript.js
	new file:   resources/flippy_files/js/shBrushXml.js
	new file:   resources/flippy_files/js/shCore.js
	modified:   configure.zcml
	new file:   skins.zcml
	renamed:    resources/flippy_files/README.md -> skins/collective_fliptiles/README.md
	renamed:    resources/flippy_files/css/help.png -> skins/collective_fliptiles/css/help.png
	renamed:    resources/flippy_files/css/magnifier.png -> skins/collective_fliptiles/css/magnifier.png
	renamed:    resources/flippy_files/css/page_white_code.png -> skins/collective_fliptiles/css/page_white_code.png
	renamed:    resources/flippy_files/css/page_white_copy.png -> skins/collective_fliptiles/css/page_white_copy.png
	renamed:    resources/flippy_files/css/printer.png -> skins/collective_fliptiles/css/printer.png
	renamed:    resources/flippy_files/css/shCore.css -> skins/collective_fliptiles/css/shCore.css
	renamed:    resources/flippy_files/css/shThemeDefault.css -> skins/collective_fliptiles/css/shThemeDefault.css
	renamed:    resources/flippy_files/css/shThemeDjango.css -> skins/collective_fliptiles/css/shThemeDjango.css
	renamed:    resources/flippy_files/css/shThemeEclipse.css -> skins/collective_fliptiles/css/shThemeEclipse.css
	renamed:    resources/flippy_files/css/shThemeEmacs.css -> skins/collective_fliptiles/css/shThemeEmacs.css
	renamed:    resources/flippy_files/css/shThemeFadeToGrey.css -> skins/collective_fliptiles/css/shThemeFadeToGrey.css
	renamed:    resources/flippy_files/css/shThemeMidnight.css -> skins/collective_fliptiles/css/shThemeMidnight.css
	renamed:    resources/flippy_files/css/shThemeRDark.css -> skins/collective_fliptiles/css/shThemeRDark.css
	renamed:    resources/flippy_files/demo.css -> skins/collective_fliptiles/demo.css
	renamed:    resources/flippy_files/demo.js -> skins/collective_fliptiles/demo.js
	renamed:    resources/flipper.js -> skins/collective_fliptiles/flipper.js
	renamed:    resources/flippy_files/howto.html -> skins/collective_fliptiles/howto.html
	renamed:    resources/flippy_files/jquery.flippy.js -> skins/collective_fliptiles/jquery.flippy.js
	renamed:    resources/flippy_files/jquery.flippy.min.js -> skins/collective_fliptiles/jquery.flippy.min.js
	renamed:    resources/flippy_files/js/excanvas.min.js -> skins/collective_fliptiles/js/excanvas.min.js
	renamed:    resources/flippy_files/js/shBrushJScript.js -> skins/collective_fliptiles/js/shBrushJScript.js
	renamed:    resources/flippy_files/js/shBrushXml.js -> skins/collective_fliptiles/js/shBrushXml.js
	renamed:    resources/flippy_files/js/shCore.js -> skins/collective_fliptiles/js/shCore.js
registered flippy javascripts