diff --git a/.gitignore b/.gitignore
index 66234bb9b..a2ba07f60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 application/tests/cache
 /cache
 /uploads
-/libraries/Zend
+/libraries
 /logs
 
 # aksw specific mud
@@ -34,6 +34,10 @@ build/
 !build/phpcs.xml
 !build/phpcmd.xml
 
-# vagrant stuff
-Vagrantfile
-.vagrant
+# composer stuff
+/vendor
+composer.phar
+# for now we ignore the composer.lock, but we should commit it some dome day, especially for releases
+
+# devenv stuff
+/devenv
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index aeabfa427..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "libraries/RDFauthor"]
-	path = libraries/RDFauthor
-	url = git://github.com/AKSW/RDFauthor.git
-[submodule "libraries/Erfurt"]
-	path = libraries/Erfurt
-	url = git://github.com/AKSW/Erfurt.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..9fae3f657
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,194 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/) as of version 1.0.0.
+
+## [1.0.0] - 2016-10-04
+
+### Added
+- Add a help text for the filter module
+- Add option to (not) display default type column
+- Add first draft (incomplete) to provide french
+- SPARQL: add option to export result to CSV
+- Add hide type when using add instance
+- Add json-support for registrationAction
+- Add prependTitleProperty again, remove unused methods and keep a single instance of erfurt
+- Add showHiddenElements to naviagtion config
+- Add hugarian to language selection
+- Add initial ResourceJsonrpcAdapter
+- Add getTitle method to ModelJsonrpcAdapter
+- Add RDF/JSON (Alternate, Talis) content type
+- Add support for attributes in toolbar buttons
+- Add support for docker based devenv
+- Add controller test for resource export action
+- Add an onRegisterUser Event
+- Add an onRegisterUserFailed Event
+- Add test makefile for new composer download
+
+### Changed
+- Update RDFauthor
+- Use onResolveDomainAliasInput on URL detection
+- TitleHelper improvements: Chunk/Bulk Querying
+- Changing the workflow of the TitleHelper using the ResourcePool
+- Update getValues functionality using the ResourcePool - Scalability Improvement
+- Changing getAllProperties functionality to work with the MemoryModel and ResourcePool
+- Changing debug workflow with blanknodes on gettitles + cleanup
+- Changing debug workflow on addResource
+- Re-enabling inverse show properties in table view but on a scaleable way
+- Change sameTerm Filter into Equals constraint in NavigationController
+- Make new TitleHelper aware of languages
+- Add getResources() call and unify testShownPropertiesAddTitles
+- Set zend version to latest 1.x. Fix #306.
+- Move responsibility for contentType and fileExtension to Erfurt
+- Improve Exception output
+- Update jQuery to 1.9.1 and add jQuery migrate
+- Using composer for dependencies
+- Update jquery-ui to 1.8.22. Fix #337
+- Refactor usage of exit to using return
+- Clean up default.ini/config.ini.dist, disable caches per default
+- Remove trim() to give more meaningfull output
+- Improve FileCommentSniff to also accept older years and to ignore sub repos
+- Increse minimal PHP version to 5.4.0
+- Change sort option to SORT_NUMERIC
+- Modify help menu building process
+- Deactivate ckan, mail and pingback extension
+- Add data route to default config
+- Update Linked Data plugin to use data route
+- Enhance environment for controller unit tests
+- Replace sameterm with equals in navbox
+- Use IN where possible
+- Optimize offset/limit usage & refactor js code a bit
+- Make codesniffer now ignores the FileCommentSniff and make codesniffer_year includes the Sniff
+- Disable front-end cache in config.ini.dist
+- Change the Documentation link from Github to the new Documentation
+
+### Fixed
+- Fix type handling in rdfauthor popover controller
+- Fix #278 Add Property not working properly
+- Complete license and copyright information in doc blocks
+- Additional fixes while firing onRegisterUser and onRegisterUserFailed event
+- added workaround to handle statements with empty object URIs, which are sometimes provided by RDFauthor editor (seems to be related to line 467 in extensions/themes/silverblue/scripts/support.js)
+- Only Uris should be used as links in a List. BugFix
+- Prevent Bugs with wrong initalized class attributes
+- Fix try to get property of non-object, when deleting model
+- Fix pingback takes for ever
+- Fix #286. Also consider colon in OntoWiki_Utils::compactUri method.
+- Fix #258. Forward Erfurt.
+- Fix community tab
+- Fix selectlanguage config for russian
+- Fix comments if creator not set.
+- Fix getting branch name (wasn't language independent)
+- Fix #145. Fix special chars in Linked Data request URIs.
+- Fix testing for extensions
+- Fix handling of protocols forwarded by proxy. Fix #313.
+- Fix typo in Bootstrap comment
+- Fix 319. Expose navigationAddElement in navigation.js
+- Fix setting select clause instead of prologue part and forward Erfurt
+- Fall back if no feed is specified
+- Fix #347. Remove require_once because we are using autoloader now
+- Fix skipped test
+- Fix integration tests to fit new result format
+- #332: Fix "Shift + Alt" key capture issue
+- Fix content-type for resource exports
+- Fix support for JSON content types in Linked Data plugin
+- Fix indentation of mappings array
+
+### Removed
+- Removing subjects from inverse relations memory model
+- Remove OntoWiki_Controller_Service. Fix #242.
+- Remove useless add-method from ResourceJsonrpcAdapter
+- Remove Vagrant development environment
+- Remove test target in makefile
+
+## [0.9.11] - 2014-01-31
+
+- Improve model selection in linkeddataserver extension
+- Extend cache clear script by support for query and translation cache
+- Fix #60: Add script to clear cache via shell
+- fix #201 - removed css classes for modal and set z-index of applicationbar to 999
+- Fix 271. Fix Output Format of queries editor
+- fix #201 - fixed z-index for modal-wrapper-propertyselector
+- Merge pull request #268 from hknochi/feature/fix-extension-enabler
+- Merge pull request #269 from hknochi/feature/fix-pagination
+- fix issue #167 - invalidate extensionCache to distribute requested changes
+- fix issue #261 - added limit-parameter to url
+- improve cron job
+- Add list-events target to Makefile
+- remove log in about screen
+- avoid broken feed URLs on version / names with spaces
+- use configure name instead of hardcoded one
+- fixed issue #201 - added css rules for modal-wrapper
+- fixed issue #201 - added css rules for simplemodal-container and -overlay
+- Fix build to ignore worker shell scripts
+- Reorganize shell scripts to avoid build failure
+- Cleanup mail extension job class by removing obsolete members
+- Added console client and an example extension for testing Erfurts worker
+- Add support for Erfurts background jobs
+- add min-height to <span> in resource view
+- Add hidden save and cancle buttons in listmode
+- Reorganize some code in support.js
+- Fix editProperty to work in extended mode (+)
+- Allow configuration of session cookie parameters, such as session lifetime
+- Fix #259. Write alle defined prefixes to RDFa output.
+- Fix warning, when site redirect takes place. Fix #260.
+- fix wrong server class includes (closes #256)
+- initial version of SelectorModule
+- Fix model creation if no title is specified
+- move inner window modules outside of master form
+- Add “View as Resource” entry to model menu. Fix #152
+- fix wrong encoded query parameter
+- add even/odd classes for row and noodds parameter
+- use new querylink feature of table partial
+- remake table partial, add query link enhancement
+- Fix #152. Move menu creation to Menu_Registry.
+- add xdebug link
+- Remove unused action service/entities
+
+## [0.9.10] - 2013-07-11
+
+- new model creation / add data procedure
+- fixes in query editor
+- performance issues in title helper
+- unify CommentModule and LastcommentsModule, increase limit and set ordering
+- +100 other commits
+- depends on Erfurt 1.6
+- depends on RDFauthor 0.9.6
+
+## [0.9.8] - 2013-02-01
+
+- fix cors header
+- add doap:wiki to the weblink list (2 weeks ago by Sebastian Tramp)
+- add head action to return the request header for given uri
+- fix extensions setting page (toggleswitch) #179
+- Fixing Sort functionality of the Navigation Box extension re-enabling the Sort Menue
+- prevent open paranthesis bug while using the limit buttons (100 / all)
+- Fix #172 - rewrite rules in .htaccess
+- use getReadableGraphsUsingResource method on Store
+- cleanup togglebutton changes
+- fix toggle button for new jquery version (#167)
+- depends on Erfurt 1.5
+- depends on RDFauthor 0.9.5
+
+## [0.9.7] - 2012-11-27
+
+- GUI niceups
+- lots of fixes
+- https://github.com/AKSW/OntoWiki/issues?milestone=1&page=1&state=closed
+- RDFauthor is now a separate package
+- Add support for additonal vhosts
+- increment RDFauthor dependency
+- allow usage of virtuosos bd.ini if present
+- add gnome desktop file
+
+## 0.9.6-21 - 2012-03-03
+
+- fix RDFauthor integration
+- forward RDFauthor to b780680
+- forward OntoWiki to 04b33fd
+
+[1.0.0]: https://github.com/AKSW/OntoWiki/compare/v0.9.11...v1.0.0
+[0.9.11]: https://github.com/AKSW/OntoWiki/compare/v0.9.10...v0.9.11
+[0.9.10]: https://github.com/AKSW/OntoWiki/compare/v0.9.8...v0.9.10
+[0.9.8]: https://github.com/AKSW/OntoWiki/compare/v0.9.7...v0.9.8
+[0.9.7]: https://github.com/AKSW/OntoWiki/compare/v0.9.6-21...v0.9.7
diff --git a/Makefile b/Makefile
index 47742a185..9695dfac2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,25 @@
-ZENDVERSION=1.11.5
-ZEND2VERSION=2.2.2
+PHPUNIT = ./vendor/bin/phpunit
+PHPCS = ./vendor/bin/phpcs
+PHPCBF = ./vendor/bin/phpcbf
+
+# Get calid composer executable
+COMPOSER = $(shell which composer)
+ifeq ($(findstring composer, $(COMPOSER)), )
+    COMPOSER = $(shell which composer.phar)
+    ifeq ($(findstring composer.phar, $(COMPOSER)), )
+        ifneq ($(wildcard composer.phar), )
+            COMPOSER = php composer.phar
+        else
+            COMPOSER =
+        endif
+    endif
+endif
 
 default:
 	@echo "Typical targets your could want to reach:"
 	@echo ""
 	@echo "-->   make deploy ............... Install OntoWiki <-- in doubt, use this"
-	@echo "                                  (use this for server installations)"
-	@echo ""
-	@echo "      make install .............. Install OntoWiki for developer"
-	@echo "                                  (you will need github access and ssh for this)"
+	@echo "      make install .............. deploy and install are equivalent"
 	@echo ""
 	@echo "      make help ................. Show more (developer related) make targets"
 	@echo ""
@@ -19,187 +30,84 @@ default:
 help:
 	@echo "Please use: (e.g. make deploy)"
 	@echo "     deploy ..................... Runs everything which is needed for a deployment"
-	@echo "     install .................... Make directories, zend and libraries"
+	@echo "     install .................... Equivalent to deploy"
 	@echo "     help ....................... This help screen"
 	@echo "     help-cs .................... Show help for code sniffing targets"
 	@echo "     help-test .................. Show help for test related targets"
 	@echo "     -------------------------------------------------------------------"
-	@echo "     vagrant .................... Prepare environment to run with Vagrant (no zend)"
-	@echo "     vagrant-clean .............. Removes owdev box in order to ensure you have the latest version"
 	@echo "     directories ................ Create cache/log dir and chmod environment"
-	@echo "     zend ....................... Download and install Zend under libraries"
-	@echo "     libraries .................. Zend, Erfurt and RDFauthor submodules (read-write)"
-	@echo "     erfurt ..................... Clone under libraries"
-	@echo "     rdfauthor .................. Clone under libraries"
-	@echo "     pull ....................... 'git pull' for all repos"
-	@echo "     fetch ...................... 'git fetch' for all repos"
-	@echo "     fetch-all .................. 'git fetch --all', i.e. fetch all repos on all remotes"
-	@echo "     add-upstream ............... Adds standard AKSW git repo as remote/upstream"
-	@echo "     status ..................... 'git status' for all repos"
-	@echo "     branch-check ............... 'git rev-parse' for all repos"
 	@echo "     clean ...................... Deletes all log and cache files"
-	@echo "     install-test-environment ... Install neccessary software (PHPUnit,...))"
 	@echo "     odbctest ................... Executes some tests to check the Virtuoso connection"
 
 help-cs:
-	@echo "Please use: (e.g. make cs-install)"
-	@echo "     cs-install ............................ Install CodeSniffer"
-	@echo "     cs-uninstall .......................... Uninstall CodeSniffer"
-	@echo "     cs-install-submodule MPATH=<path> ..... Install CodeSniffer on a submodule,"
-	@echo "                                             <path> must by the relative path to the submodule"
-	@echo "     cs-uninstall-submodule MPATH=<path> ... Uninstall CodeSniffer on a submodule,"
-	@echo "                                             <path> must by the relative path to the submodule"
-	@echo "     cs-enable ............................. Enable CodeSniffer to check code before every commit"
-	@echo "     cs-disable ............................ Disable CodeSniffer code checking"
-	@echo "     cs-check-commit ....................... Run pre-commit code checking manually"
-	@echo "     cs-check-commit-emacs ................. Same as cs-check-commit with emacs output"
-	@echo "     cs-check-commit-intensive ............. Run pre-commit code checking"
-	@echo "                                             manually with stricter coding standard"
-	@echo "     cs-check .............................. Run complete code checking"
-	@echo "     cs-check-full ......................... Run complete code checking with detailed output"
-	@echo "     cs-check-emacs ........................ Run complete code checking with with emacs output"
-	@echo "     cs-check-blame ........................ Run complete code checking with blame list output"
-	@echo "     cs-check-intensive .................... Run complete code checking with"
-	@echo "                                             stricter coding standard"
-	@echo "     cs-check-intensive-full ............... Run complete code checking with"
-	@echo "                                             stricter coding standard and detailed output"
-	@echo "     possible Parameter:"
-	@echo "     > CHECKPATH=<path> ................. Run code checking on specific relative path"
-	@echo "     > SNIFFS=<sniff 1>,<sniff 2> ... Run code checking on specific sniffs"
-	@echo "     > OPTIONS=<option> ............. Run code checking with specific CodeSniffer options"
+	@echo "Please use: (e.g. make codesniffer)"
+	@echo "     codesniffer ............................ Run CodeSniffer except for the FileCommentSniff"
+	@echo "			codesniffer_year ....................... Run CodeSniffer including the FileCommentSniff"
+	@echo "     codebeautifier ......................... Run CodeBeautifier"
 
 help-test:
 	@echo "  test ......................... Execute unit, integration and extension tests"
 	@echo "  test-unit .................... Run OntoWiki unit tests"
-	@echo "  test-unit-cc ................. Same as above plus code coverage report"
 	@echo "  test-integration-virtuoso .... Run OntoWiki integration tests with virtuoso"
-	@echo "  test-integration-virtuoso-cc . Same as above plus code coverage report"
 	@echo "  test-integration-mysql ....... Run OntoWiki integration tests with mysql"
-	@echo "  test-integration-mysql-cc .... Same as above plus code coverage report"
 	@echo "  test-extensions .............. Run tests for extensions"
 
-# top level target
-
-deploy: directories clean zend submodules
+getcomposer:
+	curl -o composer.phar "https://getcomposer.org/composer.phar"
+	php composer.phar self-update
 
-install: directories libraries
+install: deploy
 
-vagrant: directories clean submodules-developer
-	rm -rf libraries/Zend # vagrant has own zend
-	rm -f Vagrantfile
-	!(ls $(PWD)/application/scripts/Vagrantfile > /dev/null 2> /dev/null) || ln -s $(PWD)/application/scripts/Vagrantfile $(PWD)/Vagrantfile
-	(ls $(PWD)/Vagrantfile > /dev/null 2> /dev/null) || ln -s $(PWD)/application/scripts/Vagrantfile-dist $(PWD)/Vagrantfile
-	(ls $(HOME)/.vagrant.d/boxes/owdev > /dev/null 2> /dev/null) || vagrant box add owdev http://files.ontowiki.net/owdev.box
-	@echo ""
-	@echo '=> Now type "vagrant up"'
-
-vagrant-clean:
-	rm -f Vagrantfile
-	vagrant box remove owdev
+ifdef COMPOSER
+deploy: directories clean composer-install
+else
+deploy: getcomposer
+	make deploy
+endif
 
 clean:
-	rm -rf cache/* logs/*
+	rm -rf cache/* logs/* libraries/*
 
 directories: clean
 	mkdir -p logs cache
 	chmod 777 logs cache extensions
 
-libraries: zend submodules-developer
-
-submodules: # read-only
-	git submodule init
-	git config submodule.libraries/Erfurt.url "https://github.com/AKSW/Erfurt.git"
-	git config submodule.libraries/RDFauthor.url "https://github.com/AKSW/RDFauthor.git"
-	git submodule update
-
-submodules-developer: # read-write
-	git submodule init
-	git config submodule.libraries/Erfurt.url "git@github.com:AKSW/Erfurt.git"
-	git config submodule.libraries/RDFauthor.url "git@github.com:AKSW/RDFauthor.git"
-	git submodule update
-
-# developer targets
-
-pull:
-	git pull
-	git submodule foreach git pull
-
-fetch:
-	git fetch
-	git submodule foreach git fetch
-
-fetch-all:
-	# Remember to add the aprorpriate upstream sources frist
-	# e.g. by using `make add-upstream`
-	git fetch --all
-	git submodule foreach git fetch --all
-
-add-upstream:
-	git remote add upstream git://github.com/AKSW/OntoWiki.git
-
-info:
-	@git --no-pager log -1 --oneline --decorate
-	@git submodule foreach git --no-pager log -1 --oneline --decorate
-
-status:
-	git status -sb
-	git submodule foreach git status -sb
-
-branch-check:
-	@git rev-parse --abbrev-ref HEAD
-	@git submodule foreach git rev-parse --abbrev-ref HEAD
-
-# libraries
-
-ZENDFILEBASE="ZendFramework-${ZENDVERSION}-minimal"
-ZENDURL="https://packages.zendframework.com/releases/ZendFramework-${ZENDVERSION}/${ZENDFILEBASE}.tar.gz"
-zend:
-	rm -rf libraries/Zend
-	curl -L -# -O ${ZENDURL} || wget ${ZENDURL}
-	tar xzf ${ZENDFILEBASE}.tar.gz
-	mv ${ZENDFILEBASE}/library/Zend libraries
-	rm -rf ${ZENDFILEBASE}.tar.gz ${ZENDFILEBASE}
-
-ZEND2FILEBASE="ZendFramework-minimal-${ZEND2VERSION}"
-ZEND2URL="https://packages.zendframework.com/releases/ZendFramework-${ZEND2VERSION}/${ZEND2FILEBASE}.tgz"
-zend2:
-	rm -rf libraries/Zend
-	curl -L -# -O ${ZEND2URL} || wget ${ZEND2URL}
-	tar xzf ${ZEND2FILEBASE}.tgz
-	mv ${ZEND2FILEBASE}/library/Zend libraries
-	rm -rf ${ZEND2FILEBASE}.tgz ${ZEND2FILEBASE}
-
-rdfauthor:
-	rm -rf libraries/RDFauthor
-	@echo 'Cloning RDFauthor into libraries/RDFauthor ...'
-	git clone git@github.com:AKSW/RDFauthor.git libraries/RDFauthor
-
+ifdef COMPOSER
+composer-install: #add difference for user and dev (with phpunit etc and without)
+	$(COMPOSER) install
+else
+composer-install:
+	@echo
+	@echo
+	@echo "!!! make $@ failed !!!"
+	@echo
+	@echo "Sorry, there doesn't seem to be a PHP composer (dependency manager for PHP) on your system!"
+	@echo "Please have a look at http://getcomposer.org/ for further information,"
+	@echo "or just run 'make getcomposer' to download the composer locally"
+	@echo "and run 'make $@' again"
+endif
 # test stuff
 
+devenv:
+	git clone "https://github.com/pfrischmuth/ontowiki-devenv.git" devenv
+	cp -i devenv/config.ini.dist ./config.ini
+	cp -i devenv/config-test.ini.dist ./application/tests/config.ini
+
 test-directories:
 	rm -rf application/tests/cache application/tests/unit/cache application/tests/integration/cache
 	mkdir -p application/tests/cache application/tests/unit/cache application/tests/integration/cache
 
 test-unit: test-directories
-	@cd application/tests && phpunit --bootstrap Bootstrap.php unit/
-
-test-unit-cc: test-directories
-	@cd application/tests/unit && phpunit
+	$(PHPUNIT) --testsuite "OntoWiki Unit Tests"
 
 test-integration-virtuoso: test-directories
-	@cd application/tests && EF_STORE_ADAPTER=virtuoso phpunit --bootstrap Bootstrap.php integration/
-
-test-integration-virtuoso-cc: test-directories
-	@cd application/tests/integration && EF_STORE_ADAPTER=virtuoso phpunit
+	EF_STORE_ADAPTER=virtuoso $(PHPUNIT) --testsuite "OntoWiki Virtuoso Integration Tests"
 
 test-integration-mysql: test-directories
-	@cd application/tests && EF_STORE_ADAPTER=zenddb phpunit --bootstrap Bootstrap.php integration/
-
-test-integration-mysql-cc: test-directories
-	@cd application/tests/integration && EF_STORE_ADAPTER=zenddb phpunit
+	EF_STORE_ADAPTER=zenddb $(PHPUNIT) --testsuite "OntoWiki Virtuoso Integration Tests"
 
-test-extensions: directories
-	@phpunit --bootstrap application/tests/Bootstrap.php extensions
+test-extensions: #directories
+	$(PHPUNIT) --testsuite "OntoWiki Extensions Tests"
 
 test:
 	make test-unit
@@ -217,20 +125,6 @@ test:
 	make test-extensions
 
 
-install-test-environment:
-	sudo apt-get install php-pear
-	sudo pear config-set auto_discover 1
-	sudo pear channel-update pear.php.net
-	sudo pear upgrade pear
-	sudo pear install -a pear.phpunit.de/PHPUnit
-	sudo pear install phpunit/PHPUnit_Selenium
-	sudo pear install phpunit/DbUnit
-
-erfurt@:
-	rm -rf libraries/Erfurt
-	@echo 'Cloning Erfurt into libraries/Erfurt ...'
-	git clone git@github.com:AKSW/Erfurt.git libraries/Erfurt
-
 odbctest:
 	@application/scripts/odbctest.php
 
@@ -241,79 +135,18 @@ debianize:
 	rm extensions/markdown/parser/PHP_Markdown_Readme.txt
 	rm extensions/markdown/parser/markdown.php
 	rm extensions/queries/resources/codemirror/LICENSE
-	rm extensions/themes/silverblue/scripts/libraries/jquery.js
+	rm extensions/themes/silverblue/scripts/libraries/jquery-1.9.1.js
 	rm libraries/RDFauthor/libraries/jquery.js
 	rm Makefile
 	@echo "now do: cp -R application/scripts/debian debian"
 
-
-# coding standard
-
 # #### config ####
-# cs-script path
-CSSPATH = application/tests/CodeSniffer/
-# ignore pattern
-IGNOREPATTERN = libraries,extensions/exconf/pclzip.lib.php,extensions/exconf/Archive.php,application/scripts,extensions/markdown/parser/markdown.php,extensions/queries/lib,extensions/queries/old
 
-# Parameter check
-ifndef CHECKPATH
-	CHECKPATH = "./"
-endif
-ifdef SNIFFS
-	SNIFFSTR = "--sniffs="$(SNIFFS)
-else
-	SNIFFSTR =
-endif
+codesniffer:
+	$(PHPCS) -p
 
-REQUESTSTR = --ignore=$(IGNOREPATTERN) $(OPTIONS) $(SNIFFSTR)  $(CHECKPATH)
-
-cs-default:
-	chmod ugo+x "$(CSSPATH)cs-scripts.sh"
-
-cs-install: cs-default
-	$(CSSPATH)cs-scripts.sh -i
-
-cs-install-submodule: cs-submodule-check cs-default
-	$(CSSPATH)cs-scripts.sh -f $(CSSPATH) -m $(MPATH)
-
-cs-uninstall-submodule: cs-submodule-check cs-default
-	$(CSSPATH)cs-scripts.sh -n $(MPATH)
-
-cs-uninstall: cs-default
-	$(CSSPATH)cs-scripts.sh -u
-
-cs-enable: cs-default
-	$(CSSPATH)cs-scripts.sh -f $(CSSPATH) -e
-
-cs-disable: cs-default
-	$(CSSPATH)cs-scripts.sh -d
-
-cs-check-commit:
-	$(CSSPATH)cs-scripts.sh -p ""
-cs-check-commit-emacs:
-	$(CSSPATH)cs-scripts.sh -p "-remacs"
-cs-check-commit-intensive:
-	$(CSSPATH)cs-scripts.sh -p "-s"
-
-cs-check:
-	@$(CSSPATH)cs-scripts.sh -c "-s --report=summary $(REQUESTSTR)"
-cs-check-intensive:
-	@$(CSSPATH)cs-scripts.sh -s -c "-s --report=summary $(REQUESTSTR)"
-cs-check-intensive-full:
-	@$(CSSPATH)cs-scripts.sh -s -c "-s --report=full $(REQUESTSTR)"
-cs-check-full:
-	@$(CSSPATH)cs-scripts.sh -c "-s --report=full $(REQUESTSTR)"
-cs-check-emacs:
-	@$(CSSPATH)cs-scripts.sh -c "--report=emacs $(REQUESTSTR)"
-cs-check-blame:
-	@$(CSSPATH)cs-scripts.sh -c "--report=gitblame $(REQUESTSTR)"
-
-cs-submodule-check:
-ifndef MPATH
-	@echo "You must Set a path to the submodule."
-	@echo "Example: MPATH=path/to/the/submodule/"
-	@exit 1
-endif
+codebeautifier:
+	$(PHPCBF)
 
 # other stuff
 
diff --git a/README.md b/README.md
index cb38a163d..349fbece1 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,12 @@ Other remarkable features are:
 * OntoWiki is backend independent, which means you can save your data on a MySQL database as well as on a Virtuoso Triple Store.
 * OntoWiki is easily extendible by you, since it features a sophisticated Extension System.
 
-## Installation
+## Installation/Update
 
-For an installation guide have a look at our [wiki](https://github.com/AKSW/OntoWiki/wiki/GetOntowikiUsers).
+If you are updating OntoWiki, please don't forget to run `make deploy`.
+If `make deploy` fails, you might also have to run `make getcomposer` once before run `make deploy` again.
+
+For further installation instructions please have a look at our [wiki](https://github.com/AKSW/OntoWiki/wiki/GetOntowikiUsers) (might be outdated in some parts).
 
 ## Screenshot / Webinar
 Below is a screenshot showing OntoWiki in editing mode.
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 9b811b965..fac711fd3 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
@@ -163,33 +163,27 @@ public function _initConfig()
 
         // set path variables
         $rewriteBase = substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], BOOTSTRAP_FILE));
-        $protocol    = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https' : 'http';
 
-        if (isset($_SERVER['SERVER_PORT'])
-            && $_SERVER['SERVER_PORT'] != '80'
-            && $_SERVER['SERVER_PORT'] != '443'
-        ) {
-            $port = ':' . $_SERVER['SERVER_PORT'];
-        } else {
-            $port = '';
+        // set protocol and read headers sent by proxies
+        $protocol = 'http';
+        if (isset($_SERVER['X-Forwarded-Protocol'])) {
+                $protocol = strtolower($_SERVER['X-Forwarded-Protocol']);
+        } else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+                $protocol = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
+        } else if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') {
+                 $protocol = 'https';
         }
 
-        if (isset($_SERVER['SERVER_NAME']) && strpos($_SERVER['SERVER_NAME'], ':') !== false) {
-            // IPv6
-            $serverName = '[' . $_SERVER['SERVER_NAME'] . ']';
-        } else if (isset($_SERVER['SERVER_NAME'])) {
-            // IPv4 or host name
-            $serverName = $_SERVER['SERVER_NAME'];
+        if (isset($_SERVER['HTTP_HOST'])) {
+            $httpHost = $_SERVER['HTTP_HOST'];
         } else {
-            // localhost
-            $serverName = 'localhost';
+            $httpHost = 'localhost';
         }
 
         $urlBase = sprintf(
-            '%s://%s%s%s',
+            '%s://%s%s',
             $protocol,
-            $serverName,
-            $port,
+            $httpHost,
             $rewriteBase
         );
 
@@ -228,11 +222,11 @@ public function _initConfig()
     protected function applySessionConfig($sessionConfig)
     {
         $cookieParams = array(
-            'lifetime' => isset($sessionConfig->lifetime) ? $sessionConfig->lifetime        : 0,
-            'path'     => isset($sessionConfig->path)     ? $sessionConfig->path            : '/',
-            'domain'   => isset($sessionConfig->domain)   ? $sessionConfig->domain          : '',
-            'secure'   => isset($sessionConfig->secure)   ? (bool) $sessionConfig->secure   : false,
-            'httpOnly' => isset($sessionConfig->httpOnly) ? (bool) $sessionConfig->httpOnly : false
+            'lifetime' => isset($sessionConfig->lifetime) ? $sessionConfig->lifetime : 0,
+            'path'     => isset($sessionConfig->path) ? $sessionConfig->path : '/',
+            'domain'   => isset($sessionConfig->domain) ? $sessionConfig->domain : '',
+            'secure'   => isset($sessionConfig->secure) ? (bool)$sessionConfig->secure : false,
+            'httpOnly' => isset($sessionConfig->httpOnly) ? (bool)$sessionConfig->httpOnly : false
         );
         call_user_func_array('session_set_cookie_params', $cookieParams);
     }
@@ -397,9 +391,7 @@ public function _initNavigation()
         }
 
         // get last route or default
-        $route = isset($session->lastRoute)
-               ? $session->lastRoute
-               : $config->route->default->name;
+        $route = isset($session->lastRoute) ? $session->lastRoute : $config->route->default->name;
 
         // register with navigation
         if (isset($config->routes->{$route})) {
diff --git a/application/classes/OntoWiki.php b/application/classes/OntoWiki.php
index f543c1621..18391193c 100644
--- a/application/classes/OntoWiki.php
+++ b/application/classes/OntoWiki.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/classes/OntoWiki/Component/Helper.php b/application/classes/OntoWiki/Component/Helper.php
index 74af28197..930fa3adc 100644
--- a/application/classes/OntoWiki/Component/Helper.php
+++ b/application/classes/OntoWiki/Component/Helper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/classes/OntoWiki/Controller/ActionHelper/List.php b/application/classes/OntoWiki/Controller/ActionHelper/List.php
index 63fa97519..f18fd1c55 100644
--- a/application/classes/OntoWiki/Controller/ActionHelper/List.php
+++ b/application/classes/OntoWiki/Controller/ActionHelper/List.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -171,7 +171,7 @@ public function removeList($name)
         $lists = $this->_owApp->session->managedLists;
 
         if (key_exists($name, $lists)) {
-            unset ($lists[$name]);
+            unset($lists[$name]);
         }
 
         throw new InvalidArgumentException('list was not found. check with listExists() first');
diff --git a/application/classes/OntoWiki/Controller/Base.php b/application/classes/OntoWiki/Controller/Base.php
index 6602ab341..0ac0865e1 100644
--- a/application/classes/OntoWiki/Controller/Base.php
+++ b/application/classes/OntoWiki/Controller/Base.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -115,9 +115,7 @@ public function init()
         $this->view->headMeta()->setName('generator', 'OntoWiki — Collaborative Knowledge Engineering');
 
         // RDFauthor view configuration
-        $viewMode = isset($this->_config->rdfauthor->viewmode)
-            ? $this->_config->rdfauthor->viewmode
-            : 'inline';
+        $viewMode = isset($this->_config->rdfauthor->viewmode) ? $this->_config->rdfauthor->viewmode : 'inline';
 
         // inject JSON variables into view
         $this->view->jsonVars
diff --git a/application/classes/OntoWiki/Controller/Service.php b/application/classes/OntoWiki/Controller/Service.php
deleted file mode 100644
index 96fa0313f..000000000
--- a/application/classes/OntoWiki/Controller/Service.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * This file is part of the {@link http://ontowiki.net OntoWiki} project.
- *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
- * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
- */
-
-/**
- * OntoWiki controller base class for components.
- *
- * Provide component-specific path variables and Zend settings.
- *
- * @category  OntoWiki
- * @package   OntoWiki_Classes_Controller
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
- * @author    Norman Heino <norman.heino@gmail.com>
- */
-class OntoWiki_Controller_Service extends Zend_Controller_Action
-{
-    /**
-     * The component's file system root directory
-     *
-     * @var string
-     */
-    protected $_componentRoot = null;
-
-    /**
-     * The components URL base
-     *
-     * @var string
-     */
-    protected $_componentUrlBase = null;
-
-    /**
-     * The component private config
-     *
-     * @var array
-     */
-    protected $_privateConfig = null;
-
-    protected $_owApp = null;
-    protected $_config = null;
-
-    /**
-     * Constructor
-     */
-    public function init()
-    {
-        parent::init();
-
-        $this->_owApp  = OntoWiki::getInstance();
-        $this->_config = $this->_owApp->config;
-
-        $cm   = $this->_owApp->extensionManager;
-        $name = $this->_request->getControllerName();
-
-        // set private config
-        if ($pc = $cm->getPrivateConfig($name)) {
-            $this->_privateConfig = $pc;
-        }
-
-        // set component root dir
-        $this->_componentRoot = $cm->getExtensionPath()
-            . $name
-            . '/';
-
-        // set component root url
-        $this->_componentUrlBase = $this->_config->staticUrlBase
-            . $this->_config->extensions->base
-            . $name
-            . '/';
-
-        $this->_helper->viewRenderer->setNoRender();
-        $this->_helper->layout()->disableLayout();
-    }
-}
diff --git a/application/classes/OntoWiki/Dispatcher.php b/application/classes/OntoWiki/Dispatcher.php
index bcd62c3d7..f96282609 100644
--- a/application/classes/OntoWiki/Dispatcher.php
+++ b/application/classes/OntoWiki/Dispatcher.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -163,6 +163,7 @@ public function isDispatchable(Zend_Controller_Request_Abstract $request)
 
         // URI may not contain a whitespace character!
         $pathInfo = str_replace(' ', '+', $pathInfo);
+        $pathInfo = urldecode($pathInfo);
 
         if (class_exists($className, false)) {
             // give a chance to let class handle (e.g. index controller news action default)
diff --git a/application/classes/OntoWiki/Extension/Manager.php b/application/classes/OntoWiki/Extension/Manager.php
index fe83bc1d0..87ad6314c 100644
--- a/application/classes/OntoWiki/Extension/Manager.php
+++ b/application/classes/OntoWiki/Extension/Manager.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2010-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -524,8 +524,8 @@ private function _getModifiedConfigsSince($time)
      * get the location of the cache
      *
      * @return string
-	 * @deprecated	use Ontowiki::getCache to access cache
-	 * @todo		to be deleted in next version
+     * @deprecated  use Ontowiki::getCache to access cache
+     * @todo        to be deleted in next version
      */
     public function getCachePath()
     {
@@ -539,7 +539,7 @@ public function getCachePath()
      */
     public function clearCache()
     {
-        $cache	= OntoWiki::getInstance()->getCache();
+        $cache = OntoWiki::getInstance()->getCache();
         $cache->clean(Zend_Cache::CLEANING_MODE_ALL);
     }
 
@@ -556,11 +556,11 @@ private function _scanExtensionPath()
             foreach ($dir as $file) {
                 if (!$file->isDot() && $file->isDir()) {
                     if (!in_array($file->getFileName(), $this->reservedNames)) {
-                        $extensionName			= $file->getFileName();
-                        $currentExtensionPath	= $file->getPathname() . DIRECTORY_SEPARATOR;
+                        $extensionName          = $file->getFileName();
+                        $currentExtensionPath   = $file->getPathname() . DIRECTORY_SEPARATOR;
                         // parse all extensions on the filesystem
                         if (is_readable($currentExtensionPath . self::EXTENSION_DEFAULT_DOAP_FILE)) {
-                            $config[$extensionName]	= $this->_loadConfigs($extensionName);
+                            $config[$extensionName] = $this->_loadConfigs($extensionName);
                         }
                     }
                 }
@@ -1134,7 +1134,7 @@ private function _loadConfigs($name)
         }
 
         //fix missing names
-        if (!isset ($config->name)) {
+        if (!isset($config->name)) {
             $config->name = $name;
         }
 
diff --git a/application/classes/OntoWiki/Jobs/Cron.php b/application/classes/OntoWiki/Jobs/Cron.php
index e69cc95c5..9cf0e062e 100644
--- a/application/classes/OntoWiki/Jobs/Cron.php
+++ b/application/classes/OntoWiki/Jobs/Cron.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2013-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -44,13 +44,14 @@ class OntoWiki_Jobs_Cron extends Erfurt_Worker_Job_Abstract
      */
     private function _toSeconds(DateInterval $interval)
     {
-        return
-            ($interval->y * 365 * 24 * 60 * 60) +
-            ($interval->m * 30 * 24 * 60 * 60) +
-            ($interval->d * 24 * 60 * 60) +
-            ($interval->h * 60 * 60) +
-            ($interval->i * 60) +
-            $interval->s;
+        $y = $interval->y * 365 * 24 * 60 * 60;
+        $m = $interval->m * 30 * 24 * 60 * 60;
+        $d = $interval->d * 24 * 60 * 60;
+        $h = $interval->h * 60 * 60;
+        $i = $interval->i * 60;
+        $s = $interval->s;
+
+        return $y + $m + $d + $h + $i + $s;
     }
 
     /**
diff --git a/application/classes/OntoWiki/Menu/Registry.php b/application/classes/OntoWiki/Menu/Registry.php
index 5638c2f9d..1ce0267a9 100644
--- a/application/classes/OntoWiki/Menu/Registry.php
+++ b/application/classes/OntoWiki/Menu/Registry.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -154,13 +154,17 @@ private function _getApplicationMenu($context = null)
 
         // help sub menue
         $helpMenu = new OntoWiki_Menu();
-        $helpMenu->setEntry('Documentation', $owApp->config->help->documentation)
-            ->setEntry('Bug Report', $owApp->config->help->issues)
-            ->setEntry(
-                'Version Info', $owApp->config->help->versioninfo . '#' .
-                $owApp->config->version->number
-            )
-            ->setEntry('About', $owApp->config->urlBase . 'application/about');
+
+        if (isset($owApp->config->help->documentation) && (trim($owApp->config->help->documentation) !== '')) {
+            $helpMenu->setEntry('Documentation', trim($owApp->config->help->documentation));
+        }
+        if (isset($owApp->config->help->issues) && (trim($owApp->config->help->issues) !== '')) {
+            $helpMenu->setEntry('Bug Report', trim($owApp->config->help->issues));
+        }
+        if (isset($owApp->config->help->versioninfo) && (trim($owApp->config->help->versioninfo) !== '')) {
+            $helpMenu->setEntry('Version Info', trim($owApp->config->help->versioninfo));
+        }
+        $helpMenu->setEntry('About', $owApp->config->urlBase . 'application/about');
 
         // build menu out of sub menus
         $applicationMenu = new OntoWiki_Menu();
@@ -276,8 +280,7 @@ private function _getModelMenu($model = null)
         }
 
         // can user delete models?
-        if (
-            $owApp->erfurt->getAc()->isModelAllowed('edit', $model)
+        if ($owApp->erfurt->getAc()->isModelAllowed('edit', $model)
             && $owApp->erfurt->getAc()->isActionAllowed('ModelManagement')
         ) {
 
@@ -344,10 +347,9 @@ private function _getResourceMenu($resource = null)
             // Delete resource option
             $url = new OntoWiki_Url(
                 array('controller' => 'resource', 'action' => 'delete'),
-                array()
+                array('r')
             );
-
-            $url->setParam('r', $resource, true);
+            $url->setParam('r', (string)$resource, false);
             $resourceMenu->appendEntry('Delete Resource', (string)$url);
         }
 
@@ -404,8 +406,7 @@ private function _getClassMenu($resource = null)
             $typeArray[] = $row['type'];
         }
 
-        if (
-            in_array(EF_RDFS_CLASS, $typeArray)
+        if (in_array(EF_RDFS_CLASS, $typeArray)
             || in_array(EF_OWL_CLASS, $typeArray)
             || $hasInstances
         ) {
diff --git a/application/classes/OntoWiki/Message.php b/application/classes/OntoWiki/Message.php
index 1200b16b8..0efbd86b0 100644
--- a/application/classes/OntoWiki/Message.php
+++ b/application/classes/OntoWiki/Message.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -66,20 +66,6 @@ class OntoWiki_Message
      */
     protected $_text = null;
 
-    /**
-     * The current view object
-     *
-     * @var OntoWiki_View
-     */
-    protected $_view = null;
-
-    /**
-     * The translation object
-     *
-     * @var Zend_Translate
-     */
-    protected $_translate = null;
-
     /**
      * Constructor
      *
@@ -97,19 +83,6 @@ public function __construct($text, $type = self::INFO, $options = array())
 
         $this->_type = $type;
         $this->_text = $text;
-
-        // Clone view
-        if (null === $this->_view) {
-            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-            if (null === $viewRenderer->view) {
-                $viewRenderer->initView();
-            }
-            $this->_view = clone $viewRenderer->view;
-            $this->_view->clearVars();
-        }
-
-        // get translation for current language
-        $this->_translate = OntoWiki::getInstance()->translate;
     }
 
     /**
@@ -133,19 +106,45 @@ public function getText()
         if (strlen($text) > 1000) {
             $text = substr($text, 0, 1000) . '...';
         }
-        $text = $this->_options['escape'] ? $this->_view->escape($text) : $text;
+        $text = $this->_options['escape'] ? $this->getView()->escape($text) : $text;
 
         return $text;
     }
 
-    private function _translate($text)
+    /**
+     * Returns the view object.
+     *
+     * @return OntoWiki_View
+     */
+    protected function getView()
     {
-        if (($this->_options['translate'] === true) && (null !== $this->_translate)) {
-            return $this->_translate->translate($text);
+        $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+        if (null === $viewRenderer->view) {
+            $viewRenderer->initView();
         }
+        $view = clone $viewRenderer->view;
+        $view->clearVars();
+        return $view;
+    }
 
+    /**
+     * Returns the translator.
+     *
+     * @return Zend_Translate
+     */
+    protected function getTranslator()
+    {
+        return OntoWiki::getInstance()->translate;
+    }
+
+    private function _translate($text)
+    {
+        if (($this->_options['translate'] === true) && ($translator = $this->getTranslator()) !== null) {
+            return $translator->translate($text);
+        }
         return $text;
     }
+
 }
 
 
diff --git a/application/classes/OntoWiki/Model.php b/application/classes/OntoWiki/Model.php
index 3f9101a55..1fb3a0f2b 100644
--- a/application/classes/OntoWiki/Model.php
+++ b/application/classes/OntoWiki/Model.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -14,6 +14,9 @@
  * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  * @author    Norman Heino <norman.heino@gmail.com>
+ * @property Zend_Log $_logger
+ * @property Erfurt_Event_Dispatcher $_eventDispatcher
+ * @property Zend_Config $_config The application configuration.
  */
 class OntoWiki_Model
 {
@@ -24,13 +27,6 @@ class OntoWiki_Model
      */
     protected $_store = null;
 
-    /**
-     * The OntoWiki Application config
-     *
-     * @var Zend_Config
-     */
-    protected $_config = null;
-
     /**
      * Whether inference features are turned on
      *
@@ -38,13 +34,6 @@ class OntoWiki_Model
      */
     protected $_inference = true;
 
-    /**
-     * The Application logger
-     *
-     * @var Zend_Log
-     */
-    protected $_logger = null;
-
     /**
      * Model instance
      *
@@ -59,13 +48,6 @@ class OntoWiki_Model
      */
     protected $_graph = null;
 
-    /**
-     * The Erfurt event dispatcher
-     *
-     * @var Erfurt_Event_Dispatcher
-     */
-    protected $_eventDispatcher = null;
-
     /**
      * Constructor
      */
@@ -73,9 +55,6 @@ public function __construct(Erfurt_Store $store, Erfurt_Rdf_Model $graph)
     {
         // system variables
         $this->_store           = $store;
-        $this->_config          = OntoWiki::getInstance()->config;
-        $this->_logger          = OntoWiki::getInstance()->logger;
-        $this->_eventDispatcher = Erfurt_Event_Dispatcher::getInstance();
 
         if (isset($this->_config->system->inference) && !(bool)$this->_config->system->inference) {
             $this->_inference = false;
@@ -110,5 +89,28 @@ public function getGraph()
     {
         return $this->_model;
     }
-}
 
+    /**
+     * Simulates properties that reference global objects.
+     *
+     * The globals are *not* stored as properties of this objects, otherwise
+     * these globals (and the whole object graph that is connected to them)
+     * are serialized when this object is stored in the session.
+     *
+     * @param string $name
+     * @return Erfurt_Event_Dispatcher|Zend_Log|Zend_Config|null
+     */
+    public function __get($name)
+    {
+        switch ($name) {
+            case '_logger':
+                return OntoWiki::getInstance()->logger;
+            case '_eventDispatcher':
+                return Erfurt_Event_Dispatcher::getInstance();
+            case '_config':
+                return OntoWiki::getInstance()->config;
+        }
+        return null;
+    }
+
+}
diff --git a/application/classes/OntoWiki/Model/Hierarchy.php b/application/classes/OntoWiki/Model/Hierarchy.php
index fd0bf3542..d85ff6f85 100644
--- a/application/classes/OntoWiki/Model/Hierarchy.php
+++ b/application/classes/OntoWiki/Model/Hierarchy.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -167,6 +167,9 @@ protected function _getEntry($resultUri, $hasChildren = false)
 
         $this->_url->setParam('r', $resultUri, true);
 
+        $hierarchyOpen = is_array($this->_session->hierarchyOpen) &&
+                         in_array($resultUri, $this->_session->hierarchyOpen);
+
         $entry = array(
             'uri'          => $resultUri,
             'url'          => (string)$this->_url,
@@ -174,8 +177,7 @@ protected function _getEntry($resultUri, $hasChildren = false)
             'title'        => $this->_titleHelper->getTitle($resultUri, $this->_config->languages->locale),
             'children'     => array(),
             'has_children' => $hasChildren,
-            'open'         =>
-            is_array($this->_session->hierarchyOpen) && in_array($resultUri, $this->_session->hierarchyOpen)
+            'open'         => $hierarchyOpen
         );
 
         return $entry;
@@ -184,8 +186,7 @@ protected function _getEntry($resultUri, $hasChildren = false)
     protected function _buildQuery()
     {
         $query    = new Erfurt_Sparql_SimpleQuery();
-        $prologue = 'SELECT DISTINCT ?classUri ?sub ?subsub ?subsubsub';
-        $query->setProloguePart($prologue);
+        $query->setSelectClause('SELECT DISTINCT ?classUri ?sub ?subsub ?subsubsub');
 
         $whereSpecs = array();
         $whereSpec  = '';
@@ -210,7 +211,7 @@ protected function _buildQuery()
         if (!$this->_options['entry']) {
             $whereSpec .= ' FILTER (regex(str(?super), "^' . EF_OWL_NS . '") || !bound(?super))';
         }
-        $whereSpec .= ' OPTIONAL {?sub <' . $this->_options['sub_relation'] . '> ?classUri. 
+        $whereSpec .= ' OPTIONAL {?sub <' . $this->_options['sub_relation'] . '> ?classUri.
                             OPTIONAL {?subsub <' . $this->_options['sub_relation'] . '> ?sub.
                                   OPTIONAL {?subsubsub <' . $this->_options['sub_relation'] . '> ?subsub}
                             }
@@ -232,4 +233,3 @@ protected function _buildQuery()
         return $query;
     }
 }
-
diff --git a/application/classes/OntoWiki/Model/Instances.php b/application/classes/OntoWiki/Model/Instances.php
index 292cd2b54..5ae28d604 100644
--- a/application/classes/OntoWiki/Model/Instances.php
+++ b/application/classes/OntoWiki/Model/Instances.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -29,6 +29,20 @@ class OntoWiki_Model_Instances extends OntoWiki_Model
      */
     protected $_allTriple;
 
+    /**
+     * OntoWiki Application config
+     *
+     * @var Zend_Config
+     */
+    protected $_config = null;
+
+    /**
+     * OntoWiki Application object
+     *
+     * @var OntoWiki
+     */
+    protected $_owApp = null;
+
     /**
      * Properties whose values are to be fetched for each resource.
      *
@@ -68,7 +82,7 @@ class OntoWiki_Model_Instances extends OntoWiki_Model
     /**
      * all resources
      */
-    protected $_resources;
+    protected $_resources = array();
 
     /**
      * @var bool
@@ -150,13 +164,12 @@ public function __construct(Erfurt_Store $store, Erfurt_Rdf_Model $model, $optio
             $this->_useCache = $options[Erfurt_Store::USE_CACHE];
         }
 
-        //TODO still needed?
-        $this->_defaultUrl['resource']      = new OntoWiki_Url(array('route' => 'properties'), array());
-        $this->_defaultUrlParam['resource'] = 'r';
-
         $this->_resourceQuery = new Erfurt_Sparql_Query2();
         $this->_resourceVar   = new Erfurt_Sparql_Query2_Var('resourceUri');
 
+        $this->_owApp   = OntoWiki::getInstance();
+        $this->_config  = $this->_owApp->config;
+
         $this->_allTriple = new Erfurt_Sparql_Query2_Triple(
             $this->_resourceVar,
             new Erfurt_Sparql_Query2_Var('p'),
@@ -192,8 +205,9 @@ public function __construct(Erfurt_Store $store, Erfurt_Rdf_Model $model, $optio
             ->addProjectionVar($this->_resourceVar)
             ->setDistinct(true);
 
-        //always query for type
-        $this->addShownProperty(EF_RDF_TYPE, '__TYPE');
+        if (!isset($this->_config->lists) || $this->_config->lists->showTypeColumnByDefault === 'true') {
+           $this->addShownProperty(EF_RDF_TYPE, '__TYPE');
+        }
 
         //set froms to the requested graph
         $this->_valueQuery->addFrom((string)$model);
@@ -246,7 +260,7 @@ public function __call($name, $arguments)
     public function __sleep()
     {
         //dont save reference to the store
-        return array_diff(array_keys(get_object_vars($this)), array('_store', '_titleHelper'));
+        return array_diff(array_keys(get_object_vars($this)), array('_store', '_titleHelper', '_config', '_owApp'));
     }
 
     public function __wakeup()
@@ -1207,10 +1221,91 @@ public function getResourceVar()
 
     /**
      * Returns the property values for all resources at once.
-     *
+     * This method receives its values from Resources from the ResourcePool.
      * @return array
      */
     public function getValues()
+    {
+        if (empty($this->_resources)) {
+            return array();
+        }
+
+        //first we have to create the list of resources that have to be shown.
+        $pool = Erfurt_App::getInstance()->getResourcePool();
+        $resources = array();
+        $valueResults = array();
+        foreach ($this->_resources as $item) {
+            $resourceUri = $item['value'];
+            $resource = $pool->getResource($resourceUri, (string)$this->_model);
+
+            //secondly we have to walk throw the list of interesting properties to bw shown
+            $valueResults[$resourceUri] = array();
+            foreach ($this->_shownProperties as $key => $property) {
+                $propertyUri = $property['uri'];
+                $variable = $property['var']->getName();
+                $propertyResource = $pool->getResource($propertyUri, (string)$this->_model);
+
+                //now we have to extract the values according the current property from the resource
+                $values = $resource->getMemoryModel()->getValues($resourceUri, $propertyUri);
+                foreach ($values as $value) {
+
+                    //initialising the value with the original content
+                    $revisedValue = $value['value'];
+                    $link = null;
+
+                    //but we have to do something specific if the value is a resource
+                    if ($value['type'] == 'uri') {
+                        // skip blanknode values here due to backend problems with filters
+                        if (substr($value['value'], 0, 2) == '_:') {
+                            continue;
+                        }
+
+                        $url = new OntoWiki_Url(array('route' => 'properties'), array('r'));
+                        $link = (string)$url->setParam('r', $value['value'], true);
+                        $event = new Erfurt_Event('onDisplayObjectPropertyValue');
+                        $event->property = $propertyUri;
+                        $event->value = $value['value'];
+                        $revisedValue = $event->trigger();
+
+                        // set default if event has not been handled
+                        if (!$event->handled()) {
+                            $revisedValue = $this->_titleHelper->getTitle($value['value']);
+                        }
+
+                    } else { // the value is not a resource but a literal value
+                        $event           = new Erfurt_Event('onDisplayLiteralPropertyValue');
+                        $event->property = $propertyUri;
+                        $event->value    = $value['value'];
+                        $event->setDefault($value['value']);
+                        $revisedValue = $event->trigger();
+                    }
+                    //now we have to assign the facts to the result array
+                    $valueResults[$resourceUri][$variable][] = array(
+                        'value'     => $revisedValue,
+                        'origvalue' => $value['value'],
+                        'type'      => $value['type'],
+                        'url'       => $link,
+                        'uri'       => $value['value'] //TODO: rename (can be literal)
+                    );
+                }
+            }
+        }
+
+        //some assignments
+        $this->_values         = $valueResults;
+        $this->_valuesUptodate = true;
+
+        //returning the result
+        return $valueResults;
+    }
+
+    /**
+     * Returns the property values for all resources at once.
+     * This method generate one SPARQL query to receive all values .
+     * Original Name was getValues()
+     * @return array
+     */
+    public function getValuesBySingleQuery()
     {
         if ($this->_valuesUptodate) {
             return $this->_values;
@@ -1350,7 +1445,6 @@ public function getValues()
 
         $this->_values         = $valueResults;
         $this->_valuesUptodate = true;
-
         return $valueResults;
     }
 
@@ -1393,7 +1487,51 @@ public function getAllPropertiesQuery($inverse = false)
         return $query;
     }
 
+    /**
+     * Returns a list of properties used by the current list of resources.
+     * Original Name was getValues()
+     * @return array
+     */
     public function getAllProperties($inverse = false)
+    {
+        if ((empty($this->_resources) && $this->_resourcesUptodate)) {
+            return array();
+        }
+
+        $pool = Erfurt_App::getInstance()->getResourcePool();
+        $propertyUris = array();
+
+        $memoryModel = new Erfurt_Rdf_MemoryModel();
+
+        foreach ($this->_resources as $item) {
+            $resourceUri = $item['value'];
+            $resource = $pool->getResource($resourceUri, (string)$this->_model);
+
+            if ($inverse == false) {
+                $resourceDescription = $resource->getDescription();
+                $memoryModel->addStatements($resourceDescription);
+            } else {
+                $resourceDescription = $resource->getDescription(array('fetchInverse' => true));
+                $memoryModel->addStatements($resourceDescription);
+                //remove s from memory model to extract only inverse relations
+                $memoryModel->removeS($resourceUri);
+            }
+        }
+        $predicates = $memoryModel->getPredicates();
+
+        foreach ($predicates as $uri) {
+            $propertyUris[] = array('uri' => $uri);
+        }
+        return $this->convertProperties($propertyUris);
+    }
+
+    /**
+     * Returns the list of properties used by all resources at once.
+     * This method generate one SPARQL query .
+     * Original Name was getAllProperties()
+     * @return array
+     */
+    public function getAllPropertiesBySingleQuery($inverse = false)
     {
         if (empty($this->_resources) && $this->_resourcesUptodate) {
             return array();
@@ -1766,13 +1904,12 @@ protected function updateValueQuery()
             $this->_valueQuery->addElement($this->_valueQueryResourceFilter);
         }
 
-        $this->_valueQueryResourceFilter->setConstraint(
-            empty($resources)
-            ?
-            new Erfurt_Sparql_Query2_BooleanLiteral(false)
-            :
-            new Erfurt_Sparql_Query2_ConditionalOrExpression($resources)
-        );
+        if (!empty($resources)) {
+            $constraint = new Erfurt_Sparql_Query2_ConditionalOrExpression($resources);
+        } else {
+            $constraint = new Erfurt_Sparql_Query2_BooleanLiteral(false);
+        }
+        $this->_valueQueryResourceFilter->setConstraint($constraint);
 
         //fix for a strange issue where a query with only optionals fails
         //(but there is a magic/unkown condition, that makes it work for some queries!?)
@@ -1892,9 +2029,7 @@ public static function getSelectedClass()
             $list   = $listHelper->getList($listName);
             $filter = $list->getFilter();
 
-            return isset($filter['type0']['rdfsclass'])
-                ? $filter['type0']['rdfsclass']
-                : -1;
+            return isset($filter['type0']['rdfsclass']) ? $filter['type0']['rdfsclass'] : -1;
         }
 
         return -1;
diff --git a/application/classes/OntoWiki/Model/Resource.php b/application/classes/OntoWiki/Model/Resource.php
index 565986d99..5532b84e7 100644
--- a/application/classes/OntoWiki/Model/Resource.php
+++ b/application/classes/OntoWiki/Model/Resource.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/classes/OntoWiki/Model/TitleHelper.php b/application/classes/OntoWiki/Model/TitleHelper.php
index 83405b867..22fef3b6b 100644
--- a/application/classes/OntoWiki/Model/TitleHelper.php
+++ b/application/classes/OntoWiki/Model/TitleHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -15,11 +15,6 @@
  */
 class OntoWiki_Model_TitleHelper
 {
-    /**
-     * Static title cache per graph
-     */
-    private static $_titleCache = array();
-
     /**
      * Whether to always search all configured title properties
      * in order to find the best language match or stop at the
@@ -37,12 +32,19 @@ class OntoWiki_Model_TitleHelper
      */
     protected $_alwaysUseLocalNames = false;
 
+    /**
+     * The singleton instance
+     *
+     * @var OntoWiki_Model_TitleHelper
+     */
+    private static $_instance = null;
+
     /**
      * The languages to consider for title properties.
      *
      * @var array
      */
-    protected $_languages = array('', 'en');
+    protected $_languages = array('en','','localname');
 
     /**
      * The model object to operate on
@@ -51,26 +53,12 @@ class OntoWiki_Model_TitleHelper
      */
     protected $_model = null;
 
-    /**
-     * Graph pattern that defines resources to operate on.
-     *
-     * @var string
-     */
-    protected $_resourcePattern = '?p ?o . ';
-
     /**
      * The resources for whitch to fetch title properties
      *
      * @var array
      */
-    protected $_resources = null;
-
-    /**
-     * Flag that indicates whether resources have been added
-     *
-     * @var boolean
-     */
-    protected $_resourcesAdded = false;
+    protected $_resources = array();
 
     /**
      * Resource query object
@@ -79,13 +67,6 @@ class OntoWiki_Model_TitleHelper
      */
     protected $_resourceQuery = null;
 
-    /**
-     * Array of resource titles found
-     *
-     * @var array
-     */
-    protected $_resourceTitles = array();
-
     /**
      * Erfurt store object
      *
@@ -94,28 +75,20 @@ class OntoWiki_Model_TitleHelper
     protected $_store = null;
 
     /**
-     * An array of naming properties whose values are
-     * displayed instead of URIs.
+     * Erfurt store object
      *
-     * @var array
+     * @var Erfurt_App
      */
-    protected $_titleProperties = null;
+    protected $_erfurtApp = null;
 
     /**
-     * Title query object
-     *
-     * @var Erfurt_Sparql_SimpleQuery
-     */
-    protected $_titleQuery = null;
-
-    /**
-     * Result set from the title query
+     * titleProperties from configuration
      *
      * @var array
      */
-    protected $_titleQueryResults = array();
+    protected $_titleProperties = null;
+
 
-    private static $_instance = null;
 
     // ------------------------------------------------------------------------
     // --- Magic methods ------------------------------------------------------
@@ -132,10 +105,12 @@ public function __construct(Erfurt_Rdf_Model $model = null, Erfurt_Store $store
             $this->_model = $model;
         }
 
+        $this->_erfurtApp = Erfurt_App::getInstance();
+
         if (null !== $store) {
             $this->_store = $store;
         } else {
-            $this->_store = Erfurt_App::getInstance()->getStore();
+            $this->_store = $this->_erfurtApp->getStore();
         }
 
         if (null == $config) {
@@ -154,7 +129,10 @@ public function __construct(Erfurt_Rdf_Model $model = null, Erfurt_Store $store
             }
         } else {
             if ($config instanceof Zend_Config) {
-                if (isset($config->titleHelper->properties)) { // naming properties for resources
+                //its possible to define myProperties in config.ini
+                if (isset($config->titleHelper->myProperties)) {
+                    $this->_titleProperties = array_values($config->titleHelper->myProperties->toArray());
+                } else if (isset($config->titleHelper->properties)) { // naming properties for resources
                     $this->_titleProperties = array_values($config->titleHelper->properties->toArray());
                 } else {
                     $this->_titleProperties = array();
@@ -168,17 +146,19 @@ public function __construct(Erfurt_Rdf_Model $model = null, Erfurt_Store $store
                 $this->_titleProperties = array();
             }
         }
-
         // always use local name for unknown resources?
         if (isset($config->titleHelper->useLocalNames)) {
             $this->_alwaysUseLocalNames = (bool)$config->titleHelper->useLocalNames;
         }
+        // add localname to titleproperties
+        $this->_titleProperties[] = 'localname';
 
         if (null === $this->_languages) {
             $this->_languages = array();
         }
         if (isset($config->languages->locale)) {
             array_unshift($this->_languages, (string)$config->languages->locale);
+            $this->_languages = array_unique($this->_languages);
         }
     }
 
@@ -209,104 +189,60 @@ public static function getInstance()
     public function addResource($resource)
     {
         $resourceUri = (string)$resource;
-
         if (Erfurt_Uri::check($resourceUri)) {
-            $this->_resources[$resourceUri] = $resourceUri;
+            if (empty($this->_resources[$resourceUri])) {
+                $this->_resources[$resourceUri] = null;
+            }
         } else {
             // throw exeption in debug mode only
             if (defined('_OWDEBUG')) {
-                throw new OntoWiki_Model_Exception(
-                    'Supplied resource ' . htmlentities('<' . $resource . '>') . ' is not a valid URI.'
-                );
+                $logger = OntoWiki::getInstance()->logger;
+                $logger->info('Supplied resource ' . htmlentities('<' . $resource . '>') . ' is not a valid URI.');
             }
         }
-
-        $this->_resourcesAdded = true;
-
         return $this;
     }
 
     /**
      * Adds a bunch of resources for which to query title properties.
-     *
-     * If you pass the $variable parameter, the elements of $resourceArray are
-     * interpreted as arrays where $variable holds the key which maps to the
-     * resource URI. Otherwise $resourceArray is interpreted as an array with
-     * resource URIs as values.
-     *
-     * @param array  $resourceArray
-     * @param string $variable the key which maps to the resource URI
-     *
+     * @param array  $resources
      * @return OntoWiki_Model_TitleHelper
      */
-    public function addResources(array $resourceArray, $variable = null)
+    public function addResources($resources = array(), $variable = null)
     {
         if (null === $variable) {
-            if (!empty($resourceArray)) {
-                // prepare merger array
-                $merger = array_combine($resourceArray, $resourceArray);
-
-                // merge in resources
-                $this->_resources = array_merge((array)$this->_resources, $merger);
+            foreach ($resources as $resourceUri) {
+                $this->addResource($resourceUri);
             }
         } else {
-            foreach ($resourceArray as $row) {
+            foreach ($resources as $row) {
                 foreach ((array)$variable as $key) {
                     if (!empty($row[$key])) {
                         $object = $row[$key];
-
+                        $toBeAdded = null;
                         if (is_array($object)) {
                             // probably support extended format
                             if (isset($object['type']) && ($object['type'] == 'uri')) {
-                                $this->addResource($object['value']);
+                                $toBeAdded = $object['value'];
                             }
                         } else {
                             // plain object
-                            $this->addResource($object);
+                            $toBeAdded = $object;
+                        }
+                        if ($toBeAdded != null) {
+                            $this->addResource($toBeAdded);
                         }
                     }
                 }
             }
         }
-
-        $this->_resourcesAdded = true;
-
-        return $this;
-    }
-
-    /**
-     * Sets the graph pattern that identifies resources for which to query
-     * title properties.
-     *
-     * @param string $pattern
-     */
-    public function setResourcePattern($pattern)
-    {
-        $this->_resourcePattern = $pattern;
-
         return $this;
     }
 
-    /**
-     * Returns the resources for which to fetch title properties
-     *
-     * @return array
-     */
-    public function getResources()
-    {
-        if (!$this->_resourcesAdded) {
-            $this->_resources = array(); //sync
-            return array();
-        }
-
-        return array_keys($this->_resources);
-    }
-
     /**
      * Returns the title property for the resource URI in the requested language.
-     * If no title property is found for that language a list of fallback languages
-     * is used. If no title property is found for any language, the local part
-     * of the resource URI is returned.
+     * If no title property is found for that language the local part
+     * of the resource URI  will be returned.
      *
      * @param string $resourceUri
      * @param string $language The preferred language for the title
@@ -318,150 +254,53 @@ public function getTitle($resourceUri, $language = null)
         if (!Erfurt_Uri::check($resourceUri)) {
             return $resourceUri;
         }
-
-        $cacheValue = $this->_cache($resourceUri, (string)$this->_model);
-        if ($cacheValue === false) {
-            // * means any language
-            if (trim($language) == '*') {
-                $language = null;
-            }
-
-            // add if we don't have this URI (but logg)
-            if (!array_key_exists($resourceUri, (array)$this->_resources)) {
-
-                if (defined('_OWDEBUG')) {
-                    $logger = OntoWiki::getInstance()->logger;
-                    $logger->info('TitleHelper: getTitle called for unknown resource. Adding resource before fetch.');
-                }
-                $this->addResource($resourceUri);
-            }
-            // if this is the first getTitle request, fetch titles
-            if (!array_key_exists($resourceUri, $this->_resourceTitles)) {
-                $this->_fetchResourceTitlesFromQueryResult();
-            }
-            // prepend the language that is asked for to the array
-            // of languages we will look for
-            $languages = $this->_languages;
-            if (null !== $language) {
-                array_unshift($languages, (string)$language);
-            }
-            $languages = array_values(array_unique($languages));
-
-            $title = null;
-            // has anything been found for the resource?
-            if (array_key_exists($resourceUri, $this->_resourceTitles)) {
-                $titleProperties = (array)$this->_resourceTitles[$resourceUri];
-
-                $currentBestLanguage = PHP_INT_MAX;
-                foreach ($this->_titleProperties as $currentTitleProperty) {
-                    // has the property been found for the resource?
-                    if (array_key_exists($currentTitleProperty, $titleProperties)) {
-
-                        for ($i = 0, $max = count($languages); $i < $max; ++$i) {
-                            $currentLanguage = $languages[$i];
-
-                            if (($i < $currentBestLanguage)
-                                && isset($titleProperties[$currentTitleProperty][$currentLanguage])
-                            ) {
-                                $title               = $titleProperties[$currentTitleProperty][$currentLanguage];
-                                $currentBestLanguage = $i;
-
-                                if (!$this->_alwaysSearchAllProperties || ($currentBestLanguage === 0)) {
-                                    // it won't get better :)
-                                    break(2);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            // still not found?
-            if (null === $title) {
-                $title = OntoWiki_Utils::contractNamespace($resourceUri);
-
-                // not even namespace found?
-                if ($title == $resourceUri && $this->_alwaysUseLocalNames) {
-                    $title = OntoWiki_Utils::getUriLocalPart($resourceUri);
-
-                    // now we have to add this localName to the ResourceTitles array to prevent
-                    // querying of resources without titles all the time
-                    $this->_resourceTitles[$resourceUri]["localname"]["localname"] = $title;
-                }
-            }
-
-            $this->_cache($resourceUri, (string)$this->_model, $title);
-        } else {
-            // cached title
-            $title = $cacheValue;
-        }
-        return $title;
-    }
-
-    /**
-     * Takes the current title query and fetches its result from the RDF store.
-     *
-     * @return array
-     */
-    public function getTitleQueryResult()
-    {
-        $execObject = $this->_model;
-        if (null !== $this->_store) {
-            $execObject = $this->_store;
+        // * means any language
+        if (trim($language) == '*') {
+            $language = null;
         }
 
-        // get results for all queries
-        $queries = $this->getTitleQueries();
+        //Have a look if we have an entry for the given resourceUri
+        if (!array_key_exists($resourceUri, $this->_resources) ) {
 
-        foreach ($queries as $resourceUri => $currentQuery) {
-            if (isset($this->_titleQueryResults[$resourceUri])) {
-                continue;
+            if (defined('_OWDEBUG')) {
+                $logger = OntoWiki::getInstance()->logger;
+                $logger->info('TitleHelper: getTitle called for unknown resource. Adding resource before fetch.');
             }
-            $queryResults = $execObject->sparqlQuery($currentQuery, array('result_format' => 'extended'));
-            $this->_titleQueryResults[$resourceUri] = $queryResults;
+            //If we dont have an entry create one
+            $this->addResource($resourceUri);
         }
-        if (defined('_OWDEBUG')) {
-            $numQueries = count($queries);
 
-            $logger = OntoWiki::getInstance()->logger;
-
-            $logger->info(
-                'TitleHelper: ' . $numQueries . ' queries with ' . count($this->_resources) . ' resources.'
-            );
+        // prepend the language that is asked for to the array
+        // of languages we will look for
+        $languages = $this->_languages;
+        if (null !== $language) {
+            array_unshift($languages, (string)$language);
         }
+        $languages = array_values(array_unique($languages));
 
-        return $this->_titleQueryResults;
-    }
-
-    /**
-     * Returns the queries for the title properties of all resources.
-     *
-     * @return Erfurt_Sparql_SimpleQuery
-     */
-    public function getTitleQueries()
-    {
-        $currentQuery = null;
-        $queries      = array();
-        $select       = 'SELECT DISTINCT ?property ?value';
-        if ($this->_resources === null) {
-            return array();
+        //Have a look if we have already a title for the given resourceUri
+        if ($this->_resources[$resourceUri] === null ) {
+            $this->_receiveTitles();
         }
-        foreach ($this->_resources as $resourceUri) {
-            $where = 'WHERE {'
-                . $this->_getTitleWhere($resourceUri)
-                . '}';
-
-            $currentQuery = new Erfurt_Sparql_SimpleQuery();
-            $currentQuery->setProloguePart($select)
-                ->setWherePart($where);
-
-            $queries[$resourceUri] = $currentQuery;
+        //Select the best found title according received titles and order of configured titleproperties
+        $title = $resourceUri;
+
+        $titles = $this->_resources[$resourceUri];
+        foreach ($languages as $language) {
+            foreach ($this->_titleProperties as $titleProperty) {
+                if (isset($titles[$titleProperty][$language]) && !empty($titles[$titleProperty][$language])) {
+                    $title = $titles[$titleProperty][$language];
+                    break(2);
+                }
+            }
         }
-
-        return $queries;
+        return $title;
     }
 
     /**
-     * Add a new title property on top of the list (most important)
+     * Add a new title property on top of the list (most important) of title properties
+     *
+     * @param $propertyUri a string with the URI of the property to add
      */
     public function prependTitleProperty($propertyUri)
     {
@@ -473,136 +312,101 @@ public function prependTitleProperty($propertyUri)
                     unset($this->_titleProperties[$key]);
                 }
             }
+
             // rewrite the array
             $this->_titleProperties = array_values($this->_titleProperties);
+
             // prepend the new URI
             array_unshift($this->_titleProperties, $propertyUri);
+
+            // reset the TitleHelper to fetch resources with new title properties
+            $this->reset();
         }
     }
 
-    /**
+     /**
      * Resets the title helper, emptying all resources, results and queries stored
      */
     public function reset()
     {
-        $this->_resources      = null;
-        $this->_resourceQuery  = null;
-        $this->_resourceTitles = array();
-
-        $this->_titleQuery        = null;
-        $this->_titleQueryResults = array();
+        $this->_resources = array();
     }
 
-    // ------------------------------------------------------------------------
-    // --- Protected methods --------------------------------------------------
-    // ------------------------------------------------------------------------
-
     /**
-     * Fetches information (e.g. title properties) of resources from a query result set.
+     * operate on _resources array and call the method to fetch the titles
+     * if no titles found for the respective resource the localname will be extracted
      *
+     * @return void
      */
-    protected function _fetchResourceTitlesFromQueryResult()
+    private function _receiveTitles()
     {
-        $titleResults = $this->getTitleQueryResult();
-        if (count($titleResults) === 0) {
-            return;
-        }
-
-        foreach ($titleResults as $resourceUri => $titleQueryResult) {
-            // fetch result
-
-            if (!(isset($titleQueryResult['head']) && isset($titleQueryResult['results']['bindings']))) {
-                continue;
+        //first we check if there are resourceUris without a title representation
+        $toBeReceived = array();
+        foreach ($this->_resources as $resourceUri => $resource) {
+            if ($resource == null) {
+                $toBeReceived[] = $resourceUri;
             }
-            $queryResult = $titleQueryResult;
-            $head        = $queryResult['head'];
-            $bindings    = $queryResult['results']['bindings'];
-
-            if (defined('_OWDEBUG')) {
-                $logger = OntoWiki::getInstance()->logger;
-
-                $logger->debug('TitleHelper _fetchResourceTitlesFromQueryResult count(bindings): ' . count($bindings));
-            }
-            foreach ($bindings as $row) {
-                // get the resource URI
-                $currentResource = $resourceUri;
-                $currentProperty = $row['property']['value'];
-                $titleValue      = $row['value']['value'];
-
-                // add the resource to the local title store
-                if (!array_key_exists($currentResource, (array)$this->_resourceTitles)) {
-                    $this->_resourceTitles[$currentResource] = array();
-                }
-
-                // add current title property to resource's title store
-                if (!array_key_exists($currentProperty, $this->_resourceTitles[$currentResource])) {
-                    $this->_resourceTitles[$currentResource][$currentProperty] = array();
-                }
-
-                // fetch the language or use default
-                $titleLang = '';
-                if (isset($row['value']['xml:lang'])) {
-                    $titleLang = $row['value']['xml:lang'];
-                }
-
-                // don't overwrite previously found title
-                if (!array_key_exists($titleLang, $this->_resourceTitles[$currentResource][$currentProperty])) {
-                    $this->_resourceTitles[$currentResource][$currentProperty][$titleLang] = $titleValue;
-                }
+        }
+        //now we try to receive the Titles from ResourcePool
+        $this->_fetchTitlesFromResourcePool($toBeReceived);
+
+        //If we dont find titles then we extract them from LocalName
+        foreach ($this->_resources as $resourceUri => $resource) {
+            if ($resource == null) {
+                $this->_resources[$resourceUri]['localname']['localname']
+                    = $this->_extractTitleFromLocalName($resourceUri);
             }
         }
     }
 
     /**
-     * Returns graph patterns for all title properties for a resource URI.
+     * fetches all titles according the given array if Uris
      *
-     * @param string $resourceUri the resource URI
-     *
-     * @return string
+     * @param array resourceUris
      */
-    protected function _getTitleWhere($resourceUri)
+    private function _fetchTitlesFromResourcePool($resourceUris)
     {
-        $where = 'OPTIONAL { <' . $resourceUri . '> ?property ?value . }';
-
-        // build title property sameTerm filters
-        $propertyFilters = array();
-        foreach ($this->_titleProperties as $uri) {
-            array_push($propertyFilters, 'sameTerm(?property, <' . $uri . '>)');
-        }
-        if (!empty($propertyFilters)) {
-            $where .= PHP_EOL . 'FILTER(' . implode(' || ', $propertyFilters) . ')';
+        $resourcePool = $this->_erfurtApp->getResourcePool();
+        $resources = array();
+        if (!empty($this->_model)) {
+            $modelUri = $this->_model->getModelIri();
+            $resources = $resourcePool->getResources($resourceUris, $modelUri);
+        } else {
+            $resources = $resourcePool->getResources($resourceUris);
         }
 
-        return $where;
-    }
-
-    private function _cache($resourceUri, $graphUri, $newValue = null)
-    {
-        $cacheBucketId = md5(serialize($this->_titleProperties));
-        if (null !== $newValue) {
-            if (!isset(self::$_titleCache[$cacheBucketId])) {
-                self::$_titleCache[$cacheBucketId] = array();
-            }
-            if (!isset(self::$_titleCache[$cacheBucketId][$graphUri])) {
-                self::$_titleCache[$cacheBucketId][$graphUri] = array();
+        $memoryModel = new Erfurt_Rdf_MemoryModel();
+        foreach ($resources as $resourceUri => $resource) {
+            $resourceDescription = $resource->getDescription();
+            $memoryModel->addStatements($resourceDescription);
+            $found = false;
+            foreach ($this->_titleProperties as $titleProperty) {
+                $values = $memoryModel->getValues($resourceUri, $titleProperty);
+                foreach ($values as $value) {
+                    if (!empty($value['lang'])) {
+                        $language = $value['lang'];
+                    } else {
+                        $language = '';
+                    }
+                    $this->_resources[$resourceUri][$titleProperty][$language] = $value['value'];
+                }
             }
-            self::$_titleCache[$cacheBucketId][$graphUri][$resourceUri] = $newValue;
-
-            return true;
         }
-
-        if (isset(self::$_titleCache[$cacheBucketId][$graphUri][$resourceUri])) {
-            return self::$_titleCache[$cacheBucketId][$graphUri][$resourceUri];
-        }
-
-        return false;
     }
 
-    private function _resetCache()
+    /**
+     * extract the localname from given resourceUri
+     *
+     * @param string resourceUri
+     * @return string title
+     */
+    private function _extractTitleFromLocalName($resourceUri)
     {
-        $cacheBucketId = md5(serialize($this->_titleProperties));
-        if (isset(self::$_titleCache[$cacheBucketId])) {
-            self::$_titleCache[$cacheBucketId] = array();
+        $title = OntoWiki_Utils::contractNamespace($resourceUri);
+        // not even namespace found?
+        if ($title == $resourceUri && $this->_alwaysUseLocalNames) {
+            $title = OntoWiki_Utils::getUriLocalPart($resourceUri);
         }
+        return $title;
     }
 }
diff --git a/application/classes/OntoWiki/Module.php b/application/classes/OntoWiki/Module.php
index 9453ea267..18f5fbe55 100644
--- a/application/classes/OntoWiki/Module.php
+++ b/application/classes/OntoWiki/Module.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2011, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -192,9 +192,7 @@ public function render($template, $vars = array(), $spec = null)
      */
     public function setContext($context)
     {
-        $this->_context = $context
-            ? (string)$context
-            : OntoWiki_Module_Registry::DEFAULT_CONTEXT;
+        $this->_context = $context ? (string)$context : OntoWiki_Module_Registry::DEFAULT_CONTEXT;
     }
 
     /**
diff --git a/application/classes/OntoWiki/Module/Exception.php b/application/classes/OntoWiki/Module/Exception.php
index a0d5091d4..0bf92c04a 100644
--- a/application/classes/OntoWiki/Module/Exception.php
+++ b/application/classes/OntoWiki/Module/Exception.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/classes/OntoWiki/Module/Registry.php b/application/classes/OntoWiki/Module/Registry.php
index ea8001e2a..a8a4924b0 100644
--- a/application/classes/OntoWiki/Module/Registry.php
+++ b/application/classes/OntoWiki/Module/Registry.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/classes/OntoWiki/Navigation.php b/application/classes/OntoWiki/Navigation.php
index 1dc55518b..85b4740e8 100644
--- a/application/classes/OntoWiki/Navigation.php
+++ b/application/classes/OntoWiki/Navigation.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2009-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/classes/OntoWiki/Pager.php b/application/classes/OntoWiki/Pager.php
index 58cc07e58..dce20fb4c 100644
--- a/application/classes/OntoWiki/Pager.php
+++ b/application/classes/OntoWiki/Pager.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2014, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -11,7 +11,7 @@
  *
  * @category  OntoWiki
  * @package   OntoWiki_Classes
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  * @author    Norman Heino <norman.heino@gmail.com>
  */
@@ -74,9 +74,7 @@ public static function get(
         self::$_url   = new OntoWiki_Url(array(), $paramsToKeep);
         self::$_url->setParam("list", $listName);
 
-        $limit = isset(self::$_url->limit)
-            ? self::$_url->limit
-            : self::$_options['default_limit'];
+        $limit = isset(self::$_url->limit) ? self::$_url->limit : self::$_options['default_limit'];
 
         if ($limit == 0) {
             // means no limit
@@ -84,9 +82,11 @@ public static function get(
             return "";
         }
 
-        $page = isset(self::$_url->{self::$_options['page_param']})
-            ? self::$_url->{self::$_options['page_param']}
-            : ($page != null ? $page : 1);
+        if (isset(self::$_url->{self::$_options['page_param']})) {
+            $page = self::$_url->{self::$_options['page_param']};
+        } else {
+            $page = ($page != null ? $page : 1);
+        }
 
         // self::$_url->limit = $limit;
         $pagerLinks = array();
@@ -161,7 +161,7 @@ public static function get(
                         $i = max(1 + $offset, $page - $maxLinksAsym); $i <= $forLoopTest; ++$i) {
                         self::$_url->{self::$_options['page_param']} = $i;
                         self::$_url->limit = $limit;
-                        
+
                         if ($page == $i) {
                             $pagerLinks[] = '<a class="selected minibutton">' . $i . '</a>';
                         } else {
diff --git a/application/classes/OntoWiki/Test/ControllerTestCase.php b/application/classes/OntoWiki/Test/ControllerTestCase.php
index db1b57e27..6488479f5 100644
--- a/application/classes/OntoWiki/Test/ControllerTestCase.php
+++ b/application/classes/OntoWiki/Test/ControllerTestCase.php
@@ -43,6 +43,8 @@ public function setUpUnitTest()
         );
 
         parent::setUp();
+
+        $this->_storeAdapter = Erfurt_App::getInstance(false)->getStore()->getBackendAdapter();
     }
 
     public function setUpExtensionUnitTest()
diff --git a/application/classes/OntoWiki/Test/UnitTestBootstrap.php b/application/classes/OntoWiki/Test/UnitTestBootstrap.php
index d127f5800..aeac04c83 100644
--- a/application/classes/OntoWiki/Test/UnitTestBootstrap.php
+++ b/application/classes/OntoWiki/Test/UnitTestBootstrap.php
@@ -61,9 +61,20 @@ public function _initErfurt()
         );
         $erfurt->setStore($store);
 
+        $erfurt->setAc(new Erfurt_Ac_None());
+
         // make available
         $ontoWiki->erfurt = $erfurt;
 
         return $erfurt;
     }
+
+    public function _initPlugins()
+    {
+        // require front controller
+        $this->bootstrap('frontController');
+        $frontController = $this->getResource('frontController');
+
+        // We do not register any plugins for unit tests.
+    }
 }
diff --git a/application/classes/OntoWiki/Toolbar.php b/application/classes/OntoWiki/Toolbar.php
index b203d92d1..2b6531874 100644
--- a/application/classes/OntoWiki/Toolbar.php
+++ b/application/classes/OntoWiki/Toolbar.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -276,6 +276,16 @@ private function _getButton($type, $options = array())
             $title = null;
         }
 
+        if (array_key_exists('attributes', $options) && is_array($options['attributes'])) {
+            $attributes = array();
+            foreach ($options['attributes'] as $key => $value) {
+                $attributes[] = $key . '="' . $value . '"';
+            }
+            $attributes = implode(' ', $attributes);
+        } else {
+            $attributes = null;
+        }
+
         // set image
         if (array_key_exists('image_url', $options)) {
             $image = $options['image_url'];
@@ -289,11 +299,12 @@ private function _getButton($type, $options = array())
 
         // construct button link
         $button = sprintf(
-            '<a class="button %s" %s %s %s><img src="%s"/><span>&nbsp;%s</span></a>',
+            '<a class="button %s" %s %s %s %s><img src="%s"/><span>&nbsp;%s</span></a>',
             $class,
             $id,
             $href,
             $title,
+            $attributes,
             $image,
             $label
         );
diff --git a/application/classes/OntoWiki/Utils.php b/application/classes/OntoWiki/Utils.php
index 53936af0a..1a995f59d 100644
--- a/application/classes/OntoWiki/Utils.php
+++ b/application/classes/OntoWiki/Utils.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -51,9 +51,9 @@ public static function compactUri($uri, $saveMode = false)
         $compactUri    = null;
         $prefix        = null;
 
-        // split URI in namespace and local part at "/" or "#"
+        // split URI in namespace and local part at "/", "#" or ":"
         $matches = array();
-        preg_match('/^(.+[#\/])(.+[^#\/])$/', $uri, $matches);
+        preg_match('/^(.+[#\/\:])(.+[^#\/\:])$/', $uri, $matches);
 
         if (count($matches) == 3) {
             $namespace = $matches[1];
@@ -314,15 +314,14 @@ public static function getUriLocalPart($uri)
      * @return string
      */
     public static function matchMimetypeFromRequest(
-        Zend_Controller_Request_Abstract $request,
+        Zend_Controller_Request_Http $request,
         array $supportedMimetypes
     ) {
         // get accept header
         $acceptHeader = strtolower($request->getHeader('Accept'));
 
-        require_once 'Mimeparse.php';
         try {
-            $match = @Mimeparse::best_match($supportedMimetypes, $acceptHeader);
+            $match = \Bitworking\Mimeparse::bestMatch($supportedMimetypes, $acceptHeader);
         } catch (Exception $e) {
             $match = '';
         }
@@ -437,4 +436,3 @@ static public function to_stdclass_recursive($o)
         return $ret;
     }
 }
-
diff --git a/application/config/default.ini b/application/config/default.ini
index 20ed41749..28116a5bb 100644
--- a/application/config/default.ini
+++ b/application/config/default.ini
@@ -30,6 +30,9 @@ title.prefix = "OntoWiki"
 ;;
 title.separator = " — "
 
+;; Option for specifying the RSS/Atom feed loaded in the OntoWiki index actions "News" module
+;; set to "false" to completely disable the feed
+news.feedUrl = "http://blog.aksw.org/feed/?cat=5&client={{version.label}}&version={{version.number}}&suffix={{version.suffix}}"
 
 ;;
 ; Title Helper Configuration
@@ -90,17 +93,22 @@ descriptionHelper.properties.skosNote = "http://www.w3.org/2004/02/skos/core#not
 descriptionHelper.properties.skosEditorialNote = "http://www.w3.org/2004/02/skos/core#editorialNote"
 
 
+;;
+; List settings
+;;
+lists.showTypeColumnByDefault = "true"
+
 ;;
 ; Version info
 ;;
 version.label  = "OntoWiki"
-version.number = "0.9.11"
+version.number = "1.0.0"
 version.suffix = ""
 
 ;;
 ; Help Menu URLs
 ;;
-help.documentation = "https://github.com/AKSW/OntoWiki/wiki"
+help.documentation = "http://docs.ontowiki.net"
 help.issues = "https://github.com/AKSW/OntoWiki/issues"
 help.versioninfo = "https://raw.github.com/AKSW/OntoWiki/master/debian/changelog"
 
@@ -123,6 +131,9 @@ routes.properties.defaults.action     = "properties"
 routes.instances.route                = "list/*"
 routes.instances.defaults.controller  = "resource"
 routes.instances.defaults.action      = "instances"
+routes.data.route                     = "data/*"
+routes.data.defaults.controller       = "resource"
+routes.data.defaults.action           = "export"
 routes.sparql.route                   = "sparql/*"
 routes.sparql.defaults.controller     = "service"
 routes.sparql.defaults.action         = "sparql"
@@ -260,19 +271,19 @@ log.path  = "logs"
 versioning = true
 
 ;; Erfurt Query Cache
-cache.query.enable = true
+cache.query.enable = false
 ;; logging is not recommended (performance)
 ;cache.query.logging = 0
 ;; only database caching at the moment
 cache.query.type = database
 
 ;; Erfurt Object Cache
-cache.enable            = true                    ; clear the cache if you switch from 0 to 1!
+cache.enable            = false                    ; clear the cache if you switch from 0 to 1!
 cache.type             = database              ; database, sqllite
 
 
 ;; Options for cache frontend
-cache.frontend.enable								= true
+cache.frontend.enable								= false
 cache.frontend.lifetime								= 0
 ;cache.frontend.logging								= false
 ;cache.frontend.write_control						= true
diff --git a/application/controllers/ApplicationController.php b/application/controllers/ApplicationController.php
index de0750d31..7f8db44c5 100644
--- a/application/controllers/ApplicationController.php
+++ b/application/controllers/ApplicationController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -30,12 +30,17 @@ public function aboutAction()
             $version .= ' ' . $this->_config->version->suffix;
         }
 
-        $cacheWritable = is_writable($this->_config->cache->path)
-            ? ' <span style="color:#aea">(writable)</span>'
-            : ' <span style="color:#eaa">(not writable!)</span>';
-        $logWritable   = is_writable($this->_config->log->path)
-            ? ' <span style="color:#aea">(writable)</span>'
-            : ' <span style="color:#eaa">(not writable!)</span>';
+        if (is_writable($this->_config->cache->path)) {
+            $cacheWritable = ' <span style="color:#aea">(writable)</span>';
+        } else {
+            $cacheWritable = ' <span style="color:#eaa">(not writable!)</span>';
+        }
+
+        if (is_writable($this->_config->log->path)) {
+            $logWritable = ' <span style="color:#aea">(writable)</span>';
+        } else {
+            $logWritable = ' <span style="color:#eaa">(not writable!)</span>';
+        }
 
         $cacheBackend         = $this->_config->cache->backend->type;
         $cacheBackendOptions  = array();
@@ -79,20 +84,16 @@ public function aboutAction()
             ),
             'Logging'        => array(
                 'Path'  => rtrim($this->_config->log->path, '/') . $logWritable,
-                'Level' => (bool)$this->_config->loglevel ? $this->_config->loglevel : 'disabled'
+                'Level' => (bool)$this->_config->log->level ? $this->_config->log->level : 'disabled'
             )
         );
 
         // check if the git comand exists and ontowiki is a working directory
-        if (file_exists(".git")
-            && substr(@exec("git --version"), 0, 11) == "git version"
-        ) {
-            @exec('git status', $arr);
+        if (file_exists('.git') && substr(@exec('git --version'), 0, 11) == 'git version') {
             $data['Git Versioning'] = array(
-                'Version'     => @exec("git describe"),
-                'Branch'      => substr($arr[0], 12),
+                'Version'     => @exec('git describe'),
+                'Branch'      => @exec('git rev-parse --abbrev-ref HEAD'),
                 'last commit' => @exec("git log --pretty=format:'%ar' -n 1")
-                //'Git Version'  => substr(@exec("git --version"),12),
             );
         }
 
@@ -224,7 +225,16 @@ public function registerAction()
             )
         );
 
+        $contentType = $this->_request->getHeader('Content-Type');
+        if (strstr($contentType, 'application/json')) {
+            $rawBody     = $this->_request->getRawBody();
+            echo $rawBody;
+            $post = Zend_Json::decode($rawBody);
+        }
+
         if ($post) {
+            /* status var in order to fire corresponding events */
+            $registrationError = true;
             $registeredUsernames      = array();
             $registeredEmailAddresses = array();
 
@@ -310,6 +320,7 @@ public function registerAction()
                                             $this->_owApp->appendMessage(
                                                 new OntoWiki_Message($message, OntoWiki_Message::SUCCESS)
                                             );
+                                            $registrationError = false;
                                         } else {
                                             $message = 'A registration error occured. Please refer to the log entries.';
                                             $this->_owApp->appendMessage(
@@ -323,6 +334,22 @@ public function registerAction()
                     }
                 }
             }
+
+            /*
+             * fire events for success and error
+             */
+            if ($registrationError === false) {
+                $event           = new Erfurt_Event('onRegisterUser');
+                $event->username = $username;
+                $event->response = $this->_response;
+                $event->trigger();
+            } else {
+                $event           = new Erfurt_Event('onRegisterUserFailed');
+                $event->username = $username;
+                $event->message = $message;
+                $event->response = $this->_response;
+                $event->trigger();
+            }
         }
     }
 
@@ -370,7 +397,8 @@ public function openidregAction()
                     // Does user already exist?
                     $message = 'A user with the given OpenID is already registered.';
                     $this->_owApp->appendMessage(new OntoWiki_Message($message, OntoWiki_Message::ERROR));
-                } else if (!empty($email) && isset($actionConfig['mailvalidation'])
+                } else if (!empty($email)
+                    && isset($actionConfig['mailvalidation'])
                     && $actionConfig['mailvalidation'] === 'yes'
                     && !$emailValidator->isValid($email)
                 ) {
@@ -631,7 +659,6 @@ public function webidregAction()
             if (!$this->_erfurt->isActionAllowed('RegisterNewUser')
                 || !($actionConfig = $this->_erfurt->getActionConfig('RegisterNewUser'))
             ) {
-
                 $message = 'Action not permitted for the current user.';
                 $this->_owApp->appendMessage(new OntoWiki_Message($message, OntoWiki_Message::ERROR));
             } else if (empty($webId)) {
@@ -642,7 +669,8 @@ public function webidregAction()
                 // Does user already exist?
                 $message = 'A user with the given WebID is already registered.';
                 $this->_owApp->appendMessage(new OntoWiki_Message($message, OntoWiki_Message::ERROR));
-            } else if (!empty($email) && isset($actionConfig['mailvalidation'])
+            } else if (!empty($email)
+                && isset($actionConfig['mailvalidation'])
                 && $actionConfig['mailvalidation'] === 'yes'
                 && !$emailValidator->isValid($email)
             ) {
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 9c7a34f5f..9f18349b9 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -130,11 +130,13 @@ protected function _debugError()
             $stacktrace       = $exception->getTrace();
             $stacktraceString = '';
             foreach ($stacktrace as $i => $spec) {
-                $lineStr = isset($spec['file'])
-                    ?
-                    ('@' . $spec['file'] . (isset($spec['line']) ? ':' . $spec['line'] : ''))
-                    :
-                    '';
+                $lineStr = '';
+                if (isset($spec['file'])) {
+                    $lineStr = '@' . $spec['file'];
+                    if (isset($spec['line'])) {
+                        $lineStr .= ':' . $spec['line'];
+                    }
+                }
                 $stacktraceString .= '#' . $i . ': ' . (isset($spec['class']) ? $spec['class'] : '') .
                     (isset($spec['type']) ? $spec['type'] : '') . $spec['function'] .
                     $lineStr . '<br />';
@@ -223,4 +225,3 @@ protected function _gracefulError()
         }
     }
 }
-
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 63a17a672..c4bf5da87 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -15,6 +15,12 @@
  */
 class IndexController extends OntoWiki_Controller_Base
 {
+
+    /**
+     * Timeout for reading the OntoWiki RSS news feed.
+     */
+    const NEWS_FEED_TIMEOUT_IN_SECONDS = 3;
+
     /**
      * Displays the OntoWiki news feed short summary (dashboard part)
      */
@@ -23,36 +29,18 @@ public function newsshortAction()
         // requires zend Feed module
         // number of news
         $feedCount = 3;
-        // create empty var for feed
-        $owFeed = null;
-        // get current version
-        $version = $this->_config->version;
-        // try reading
-        try {
-            $url = 'http://blog.aksw.org/feed/?cat=5&client='
-                . $version->label
-                . '&version='
-                . $version->number
-                . '&suffix='
-                . $version->suffix;
+        $owFeed = $this->getNews();
 
-            $owFeed = Zend_Feed::import($url);
-        } catch (Exception $e) {
-            $this->_owApp->appendMessage(
-                new OntoWiki_Message('Error loading feed: ' . $url, OntoWiki_Message::WARNING)
-            );
-            $owFeed = array();
-        }
         // create new array for data
         $data = array();
         // parse feed items into array
         foreach ($owFeed as $feedItem) {
             // form temporary array with needed data
+            $description = substr($feedItem->description(), 0, strpos($feedItem->description(), ' ', 40)) . ' [...]';
             $tempdata = array(
                 'link'        => $feedItem->link(),
                 'title'       => $feedItem->title(),
-                'description' =>
-                substr($feedItem->description(), 0, strpos($feedItem->description(), ' ', 40)) . ' [...]'
+                'description' => $description
             );
             // append temporary array to data array
             $data[] = $tempdata;
@@ -67,7 +55,7 @@ public function newsshortAction()
     }
 
     /**
-     * Displays messages only without any othe content.
+     * Displays messages only without any other content.
      */
     public function messagesAction()
     {
@@ -81,32 +69,15 @@ public function messagesAction()
      */
     public function newsAction()
     {
-        $owFeed  = null;
-        $version = $this->_config->version;
-
         $this->view->placeholder('main.window.title')->set('News');
 
-        try {
-            $url = 'http://blog.aksw.org/feed/?cat=5&client='
-                . urlencode($version->label)
-                . '&version='
-                . urlencode($version->number)
-                . '&suffix='
-                . urlencode($version->suffix);
-
-            $owFeed = Zend_Feed::import($url);
-
-            $this->view->feed        = $owFeed;
+        $owFeed = $this->getNews();
+        $this->view->feed = $owFeed;
+        if ($owFeed instanceof Zend_Feed_Abstract) {
             $this->view->title       = $owFeed->title();
             $this->view->link        = $owFeed->link();
             $this->view->description = $owFeed->description();
-        } catch (Exception $e) {
-            $this->_owApp->appendMessage(
-                new OntoWiki_Message('Error loading feed: ' . $url, OntoWiki_Message::WARNING)
-            );
-            $this->view->feed = array();
         }
-
         OntoWiki::getInstance()->getNavigation()->disableNavigation();
     }
 
@@ -143,4 +114,55 @@ public function emptyAction()
         // sorry for this hack, but I dont wanted to modify the the main layout too much ...
         $this->view->placeholder('main.window.additionalclasses')->set('hidden');
     }
+
+    /**
+     * Reads OntoWiki news from the AKSW RSS feed.
+     *
+     * @return array|Zend_Feed_Abstract
+     */
+    public function getNews()
+    {
+        // get current version
+        $version = $this->_config->version;
+        // try reading
+        try {
+            if (isset($this->_config->news) && isset($this->_config->news->feedUrl)) {
+                $url = $this->_config->news->feedUrl;
+            } else {
+                $url = 'http://blog.aksw.org/feed/?cat=5&client='
+                    . urlencode($version->label)
+                    . '&version='
+                    . urlencode($version->number)
+                    . '&suffix='
+                    . urlencode($version->suffix);
+            }
+            if ($url) {
+                $url = strtr(
+                    $url, array(
+                    '{{version.label}}'  => urlencode($version->label),
+                    '{{version.number}}' => urlencode($version->number),
+                    '{{version.suffix}}' => urlencode($version->suffix)
+                    )
+                );
+
+                /* @var $client Zend_Http_Client */
+                $client = Zend_Feed::getHttpClient();
+                $client->setConfig(array('timeout' => self::NEWS_FEED_TIMEOUT_IN_SECONDS));
+                $owFeed = Zend_Feed::import($url);
+                return $owFeed;
+            } else {
+                $message = 'Feed disabled in config.ini. You can configure a feed '
+                         . 'using the "news.feedUrl" key in your config.ini.';
+                $this->_owApp->appendMessage(
+                    new OntoWiki_Message($message, OntoWiki_Message::INFO)
+                );
+                return array();
+            }
+        } catch (Exception $e) {
+            $this->_owApp->appendMessage(
+                new OntoWiki_Message('Error loading feed: ' . $url, OntoWiki_Message::WARNING)
+            );
+            return array();
+        }
+    }
 }
diff --git a/application/controllers/ModelController.php b/application/controllers/ModelController.php
index dee5a349a..575b1667e 100644
--- a/application/controllers/ModelController.php
+++ b/application/controllers/ModelController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -545,8 +545,7 @@ public function deleteAction()
             try {
                 $this->_erfurt->getStore()->deleteModel($model);
 
-                if (
-                    (null !== $this->_owApp->selectedModel)
+                if ((null !== $this->_owApp->selectedModel)
                     && ($this->_owApp->selectedModel->getModelIri() === $model)
                 ) {
                     $this->_owApp->selectedModel = null;
@@ -633,24 +632,9 @@ public function exportAction()
 
             $filename = 'export' . date('Y-m-d_Hi');
 
-            switch ($format) {
-                case 'rdfxml':
-                    $contentType = 'application/rdf+xml';
-                    $filename .= '.rdf';
-                    break;
-                case 'rdfn3':
-                    $contentType = 'text/rdf+n3';
-                    $filename .= '.n3';
-                    break;
-                case 'rdfjson':
-                    $contentType = 'application/json';
-                    $filename .= '.json';
-                    break;
-                case 'turtle':
-                    $contentType = 'application/x-turtle';
-                    $filename .= '.ttl';
-                    break;
-            }
+            $description = Erfurt_Syntax_RdfSerializer::getFormatDescription($format);
+            $contentType = $description['contentType'];
+            $filename .= $description['fileExtension'];
 
             $this->_helper->viewRenderer->setNoRender();
             $this->_helper->layout->disableLayout();
@@ -740,8 +724,7 @@ public function infoAction()
                     . '     <' . (string)$resource . '> a <http://xmlns.com/foaf/0.1/PersonalProfileDocument>'
                     . ' }';
                 $q     = Erfurt_Sparql_SimpleQuery::initWithString($query);
-                if (
-                    $this->_owApp->extensionManager->isExtensionActive('foafprofileviewer')
+                if ($this->_owApp->extensionManager->isExtensionActive('foafprofileviewer')
                     && $store->sparqlAsk($q) === true
                 ) {
                     $this->view->showFoafLink = true;
@@ -855,9 +838,8 @@ public function updateAction()
      */
     private function _doImportActionRedirect($modelUri)
     {
-        $post          = $this->_request->getPost();
-        $id            = $post['importAction'];
-        $importOptions = $post['importOptions'];
+        $id            = $this->_request->getPost('importAction');
+        $importOptions = $this->_request->getPost('importOptions');
         $actions       = $this->_getImportActions();
 
         if (isset($actions[$id])) {
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 89455a407..f4ecc7e0c 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -67,9 +67,12 @@ public function propertiesAction()
         // Give plugins a chance to add entries to the menu
         $this->view->placeholder('main.window.menu')->set($menu->toArray(false, true));
 
-        $title       = $resource->getTitle($this->_config->languages->locale)
-            ? $resource->getTitle($this->_config->languages->locale)
-            : OntoWiki_Utils::contractNamespace((string)$resource);
+        if ($resource->getTitle($this->_config->languages->locale)) {
+            $title = $resource->getTitle($this->_config->languages->locale);
+        } else {
+            $title = OntoWiki_Utils::contractNamespace((string)$resource);
+        }
+
         $windowTitle = sprintf($translate->_('Properties of %1$s'), $title);
         $this->view->placeholder('main.window.title')->set($windowTitle);
 
@@ -169,9 +172,14 @@ public function propertiesAction()
                 )
             );
             // ->appendButton(OntoWiki_Toolbar::EDITADD, array('name' => 'Add Property', 'class' => 'property-add'));
+            $url = new OntoWiki_Url(
+                array('controller' => 'resource', 'action' => 'delete'),
+                array('r')
+            );
+            $url->setParam('r', (string)$resource, false);
             $params = array(
                 'name' => 'Delete',
-                'url'  => $this->_config->urlBase . 'resource/delete/?r=' . urlencode((string)$resource)
+                'url'  => (string)$url
             );
             $toolbar->appendButton(OntoWiki_Toolbar::SEPARATOR);
             $toolbar->appendButton(OntoWiki_Toolbar::DELETE, $params);
@@ -371,7 +379,7 @@ public function deleteAction()
 
                 // query for all triples to delete them
                 $sparqlQuery = new Erfurt_Sparql_SimpleQuery();
-                $sparqlQuery->setProloguePart('SELECT ?p, ?o');
+                $sparqlQuery->setSelectClause('SELECT ?p ?o');
                 $sparqlQuery->addFrom($modelIri);
                 $sparqlQuery->setWherePart('{ <' . $resource . '> ?p ?o . }');
 
@@ -470,24 +478,9 @@ public function exportAction()
 
         $filename = 'export' . date('Y-m-d_Hi');
 
-        switch ($format) {
-            case 'rdfxml':
-                $contentType = 'application/rdf+xml';
-                $filename .= '.rdf';
-                break;
-            case 'rdfn3':
-                $contentType = 'text/rdf+n3';
-                $filename .= '.n3';
-                break;
-            case 'rdfjson':
-                $contentType = 'application/json';
-                $filename .= '.json';
-                break;
-            case 'turtle':
-                $contentType = 'application/x-turtle';
-                $filename .= '.ttl';
-                break;
-        }
+        $formatDescription = Erfurt_Syntax_RdfSerializer::getFormatDescription($format);
+        $contentType = $formatDescription['contentType'];
+        $filename .= $formatDescription['fileExtension'];
 
         /*
          * Event: allow for adding / deleting statements to the export
diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 8e931cd5c..d9eb4eafd 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -545,7 +545,7 @@ public function updateAction()
          * deleteModel  :   model to delete statments from
          * deleteData   :   statements payload being deleted
          * insertModel  :   model to add statements to
-         * insertDara   :   statements payload being added
+         * insertData   :   statements payload being added
          */
         $event              = new Erfurt_Event('onUpdateServiceAction');
         $event->deleteModel = $deleteModel;
@@ -586,7 +586,7 @@ public function updateAction()
             OntoWiki::getInstance()->logger->info(
                 'add Statements: ' . print_r($delete, true)
             );
-            $count = $insertModel->addMultipleStatements((array)$insert);
+            $count = $insertModel->addMultipleStatements($this->sanitizeStatements((array)$insert));
             $flag  = true;
             if (defined('_OWDEBUG')) {
                 OntoWiki::getInstance()->logger->info(
@@ -1060,4 +1060,31 @@ protected function _findStatementsForObjectsWithHashes($graphUri, $indexWithHash
 
         return $result;
     }
+
+    /**
+     * Removes all statements whose object has an empty URI.
+     *
+     * Seems as if these kind of statements are sometimes provided by the RDFAuthor editor.
+     *
+     * @param array(string=>array(string=>array(string=>string))) $statements
+     * @return array(string=>array(string=>array(string=>string)))
+     */
+    protected function sanitizeStatements(array $statements)
+    {
+        foreach (array_keys($statements) as $subject) {
+            /* @var $subject string */
+            foreach (array_keys($statements[$subject]) as $predicate) {
+                /* @var $predicate string */
+                foreach ($statements[$subject][$predicate] as $index => $objectSpec) {
+                    /* @var $index integer */
+                    /* @var $objectSpec array(string=>string) */
+                    if ($objectSpec['type'] === 'uri' && empty($objectSpec['value'])) {
+                        // Empty URIs are not allowed, remove this statement from the list.
+                        unset($statements[$subject][$predicate][$index]);
+                    }
+                }
+            }
+        }
+        return $statements;
+    }
 }
diff --git a/application/scripts/Vagrantfile-dist b/application/scripts/Vagrantfile-dist
deleted file mode 100644
index 5ef4fa2df..000000000
--- a/application/scripts/Vagrantfile-dist
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- mode: ruby -*- 
-# vi: set ft=ruby :
-
-Vagrant::configure("2") do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise64" # use a fresh ubuntu box
-
-  config.vm.hostname = "owdev"
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  config.vm.network :private_network, ip: "192.168.33.10"
-  
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-  
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  config.vm.provider :virtualbox do |vb|
-    # Don't boot with headless mode
-    #vb.gui = true
-  
-    vb.customize ["modifyvm", :id, "--rtcuseutc", "on", "--memory", "2048", "--cpus", "2"]
-    #vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"]
-  end
-  
-  # Puppet settings
-  config.vm.provision :puppet do |puppet|
-    puppet.manifests_path = "application/scripts/configuration/manifests"
-    puppet.manifest_file = "ubuntu.pp"
-    puppet.module_path = "application/scripts/configuration/modules"
-    #puppet.options = "--verbose --debug"
-  end
-end
diff --git a/application/scripts/configuration/manifests/ubuntu.pp b/application/scripts/configuration/manifests/ubuntu.pp
deleted file mode 100644
index bcb50bf5e..000000000
--- a/application/scripts/configuration/manifests/ubuntu.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-stage { 'preinstall':
-  before => Stage['main']
-}
- 
-class apt_get_update {
-  exec { '/usr/bin/apt-get -y update': }
-}
- 
-class { 'apt_get_update':
-  stage => preinstall
-}
-
-class ubuntu 
-{
-    $ow_server_name     = 'ontowiki.local'
-    $ow_application_env = 'development'
-
-    $webserver_user = 'vagrant'
-    $webserver_group = 'vagrant'
-
-    $mysql_user = 'php'
-    $mysql_pw = 'php'
-    $mysql_root_pw = 'ontowiki123'
-
-    $zend_version = '1.11.7'
-
-    include bootstrap
-    include apache2
-    include php5
-    include mysql
-    include virtuoso
-    include phpunit
-    include phpqatools
-    include zend
-    include ontowiki
-}
-
-include ubuntu
diff --git a/application/scripts/configuration/modules/apache2/files/apc.php b/application/scripts/configuration/modules/apache2/files/apc.php
deleted file mode 100644
index b64201259..000000000
--- a/application/scripts/configuration/modules/apache2/files/apc.php
+++ /dev/null
@@ -1,1362 +0,0 @@
-<?php
-/*
-  +----------------------------------------------------------------------+
-  | APC                                                                  |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2011 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Authors: Ralf Becker <beckerr@php.net>                               |
-  |          Rasmus Lerdorf <rasmus@php.net>                             |
-  |          Ilia Alshanetsky <ilia@prohost.org>                         |
-  +----------------------------------------------------------------------+
-
-   All other licensing and usage conditions are those of the PHP Group.
-
- */
-
-$VERSION='$Id: apc.php 307048 2011-01-03 23:53:17Z kalle $';
-
-////////// READ OPTIONAL CONFIGURATION FILE ////////////
-if (file_exists("apc.conf.php")) include("apc.conf.php");
-////////////////////////////////////////////////////////
-
-////////// BEGIN OF DEFAULT CONFIG AREA ///////////////////////////////////////////////////////////
-
-defaults('USE_AUTHENTICATION',1);			// Use (internal) authentication - best choice if 
-											// no other authentication is available
-											// If set to 0:
-											//  There will be no further authentication. You 
-											//  will have to handle this by yourself!
-											// If set to 1:
-											//  You need to change ADMIN_PASSWORD to make
-											//  this work!
-defaults('ADMIN_USERNAME','apc'); 			// Admin Username
-defaults('ADMIN_PASSWORD','apc');  	// Admin Password - CHANGE THIS TO ENABLE!!!
-
-// (beckerr) I'm using a clear text password here, because I've no good idea how to let 
-//           users generate a md5 or crypt password in a easy way to fill it in above
-
-//defaults('DATE_FORMAT', "d.m.Y H:i:s");	// German
-defaults('DATE_FORMAT', 'Y/m/d H:i:s'); 	// US
-
-defaults('GRAPH_SIZE',200);					// Image size
-
-//defaults('PROXY', 'tcp://127.0.0.1:8080');
-
-////////// END OF DEFAULT CONFIG AREA /////////////////////////////////////////////////////////////
-
-
-// "define if not defined"
-function defaults($d,$v) {
-	if (!defined($d)) define($d,$v); // or just @define(...)
-}
-
-// rewrite $PHP_SELF to block XSS attacks
-//
-$PHP_SELF= isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'],''), ENT_QUOTES, 'UTF-8') : '';
-$time = time();
-$host = php_uname('n');
-if($host) { $host = '('.$host.')'; }
-if (isset($_SERVER['SERVER_ADDR'])) {
-  $host .= ' ('.$_SERVER['SERVER_ADDR'].')';
-}
-
-// operation constants
-define('OB_HOST_STATS',1);
-define('OB_SYS_CACHE',2);
-define('OB_USER_CACHE',3);
-define('OB_SYS_CACHE_DIR',4);
-define('OB_VERSION_CHECK',9);
-
-// check validity of input variables
-$vardom=array(
-	'OB'	=> '/^\d+$/',			// operational mode switch
-	'CC'	=> '/^[01]$/',			// clear cache requested
-	'DU'	=> '/^.*$/',			// Delete User Key
-	'SH'	=> '/^[a-z0-9]+$/',		// shared object description
-
-	'IMG'	=> '/^[123]$/',			// image to generate
-	'LO'	=> '/^1$/',				// login requested
-
-	'COUNT'	=> '/^\d+$/',			// number of line displayed in list
-	'SCOPE'	=> '/^[AD]$/',			// list view scope
-	'SORT1'	=> '/^[AHSMCDTZ]$/',	// first sort key
-	'SORT2'	=> '/^[DA]$/',			// second sort key
-	'AGGR'	=> '/^\d+$/',			// aggregation by dir level
-	'SEARCH'	=> '~^[a-zA-Z0-1/_.-]*$~'			// aggregation by dir level
-);
-
-// default cache mode
-$cache_mode='opcode';
-
-// cache scope
-$scope_list=array(
-	'A' => 'cache_list',
-	'D' => 'deleted_list'
-);
-
-// handle POST and GET requests
-if (empty($_REQUEST)) {
-	if (!empty($_GET) && !empty($_POST)) {
-		$_REQUEST = array_merge($_GET, $_POST);
-	} else if (!empty($_GET)) {
-		$_REQUEST = $_GET;
-	} else if (!empty($_POST)) {
-		$_REQUEST = $_POST;
-	} else {
-		$_REQUEST = array();
-	}
-}
-
-// check parameter syntax
-foreach($vardom as $var => $dom) {
-	if (!isset($_REQUEST[$var])) {
-		$MYREQUEST[$var]=NULL;
-	} else if (!is_array($_REQUEST[$var]) && preg_match($dom.'D',$_REQUEST[$var])) {
-		$MYREQUEST[$var]=$_REQUEST[$var];
-	} else {
-		$MYREQUEST[$var]=$_REQUEST[$var]=NULL;
-	}
-}
-
-// check parameter sematics
-if (empty($MYREQUEST['SCOPE'])) $MYREQUEST['SCOPE']="A";
-if (empty($MYREQUEST['SORT1'])) $MYREQUEST['SORT1']="H";
-if (empty($MYREQUEST['SORT2'])) $MYREQUEST['SORT2']="D";
-if (empty($MYREQUEST['OB']))	$MYREQUEST['OB']=OB_HOST_STATS;
-if (!isset($MYREQUEST['COUNT'])) $MYREQUEST['COUNT']=20;
-if (!isset($scope_list[$MYREQUEST['SCOPE']])) $MYREQUEST['SCOPE']='A';
-
-$MY_SELF=
-	"$PHP_SELF".
-	"?SCOPE=".$MYREQUEST['SCOPE'].
-	"&SORT1=".$MYREQUEST['SORT1'].
-	"&SORT2=".$MYREQUEST['SORT2'].
-	"&COUNT=".$MYREQUEST['COUNT'];
-$MY_SELF_WO_SORT=
-	"$PHP_SELF".
-	"?SCOPE=".$MYREQUEST['SCOPE'].
-	"&COUNT=".$MYREQUEST['COUNT'];
-
-// authentication needed?
-//
-if (!USE_AUTHENTICATION) {
-	$AUTHENTICATED=1;
-} else {
-	$AUTHENTICATED=0;
-	if (ADMIN_PASSWORD!='password' && ($MYREQUEST['LO'] == 1 || isset($_SERVER['PHP_AUTH_USER']))) {
-
-		if (!isset($_SERVER['PHP_AUTH_USER']) ||
-			!isset($_SERVER['PHP_AUTH_PW']) ||
-			$_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||
-			$_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD) {
-			Header("WWW-Authenticate: Basic realm=\"APC Login\"");
-			Header("HTTP/1.0 401 Unauthorized");
-
-			echo <<<EOB
-				<html><body>
-				<h1>Rejected!</h1>
-				<big>Wrong Username or Password!</big><br/>&nbsp;<br/>&nbsp;
-				<big><a href='$PHP_SELF?OB={$MYREQUEST['OB']}'>Continue...</a></big>
-				</body></html>
-EOB;
-			exit;
-			
-		} else {
-			$AUTHENTICATED=1;
-		}
-	}
-}
-	
-// select cache mode
-if ($AUTHENTICATED && $MYREQUEST['OB'] == OB_USER_CACHE) {
-	$cache_mode='user';
-}
-// clear cache
-if ($AUTHENTICATED && isset($MYREQUEST['CC']) && $MYREQUEST['CC']) {
-	apc_clear_cache($cache_mode);
-}
-
-if ($AUTHENTICATED && !empty($MYREQUEST['DU'])) {
-	apc_delete($MYREQUEST['DU']);
-}
-
-if(!function_exists('apc_cache_info') || !($cache=@apc_cache_info($cache_mode))) {
-	echo "No cache info available.  APC does not appear to be running.";
-  exit;
-}
-
-$cache_user = apc_cache_info('user', 1);  
-$mem=apc_sma_info();
-if(!$cache['num_hits']) { $cache['num_hits']=1; $time++; }  // Avoid division by 0 errors on a cache clear
-
-// don't cache this page
-//
-header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");                                    // HTTP/1.0
-
-function duration($ts) {
-    global $time;
-    $years = (int)((($time - $ts)/(7*86400))/52.177457);
-    $rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
-    $weeks = (int)(($rem)/(7*86400));
-    $days = (int)(($rem)/86400) - $weeks*7;
-    $hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
-    $mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
-    $str = '';
-    if($years==1) $str .= "$years year, ";
-    if($years>1) $str .= "$years years, ";
-    if($weeks==1) $str .= "$weeks week, ";
-    if($weeks>1) $str .= "$weeks weeks, ";
-    if($days==1) $str .= "$days day,";
-    if($days>1) $str .= "$days days,";
-    if($hours == 1) $str .= " $hours hour and";
-    if($hours>1) $str .= " $hours hours and";
-    if($mins == 1) $str .= " 1 minute";
-    else $str .= " $mins minutes";
-    return $str;
-}
-
-// create graphics
-//
-function graphics_avail() {
-	return extension_loaded('gd');
-}
-if (isset($MYREQUEST['IMG']))
-{
-	if (!graphics_avail()) {
-		exit(0);
-	}
-
-	function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$color2,$text='',$placeindex=0) {
-		$r=$diameter/2;
-		$w=deg2rad((360+$start+($end-$start)/2)%360);
-
-		
-		if (function_exists("imagefilledarc")) {
-			// exists only if GD 2.0.1 is avaliable
-			imagefilledarc($im, $centerX+1, $centerY+1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
-			imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
-			imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL|IMG_ARC_EDGED);
-		} else {
-			imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start+1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end-1))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
-			imagefill($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2, $color2);
-		}
-		if ($text) {
-			if ($placeindex>0) {
-				imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
-				imagestring($im,4,$diameter, $placeindex*12,$text,$color1);	
-				
-			} else {
-				imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
-			}
-		}
-	} 
-
-	function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$text,$placeindex=0) {
-		$r=$diameter/2;
-		$w=deg2rad((360+$start+($end-$start)/2)%360);
-
-		if ($placeindex>0) {
-			imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
-			imagestring($im,4,$diameter, $placeindex*12,$text,$color1);	
-				
-		} else {
-			imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
-		}
-	} 
-	
-	function fill_box($im, $x, $y, $w, $h, $color1, $color2,$text='',$placeindex='') {
-		global $col_black;
-		$x1=$x+$w-1;
-		$y1=$y+$h-1;
-
-		imagerectangle($im, $x, $y1, $x1+1, $y+1, $col_black);
-		if($y1>$y) imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
-		else imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
-		imagerectangle($im, $x, $y1, $x1, $y, $color1);
-		if ($text) {
-			if ($placeindex>0) {
-			
-				if ($placeindex<16)
-				{
-					$px=5;
-					$py=$placeindex*12+6;
-					imagefilledrectangle($im, $px+90, $py+3, $px+90-4, $py-3, $color2);
-					imageline($im,$x,$y+$h/2,$px+90,$py,$color2);
-					imagestring($im,2,$px,$py-6,$text,$color1);	
-					
-				} else {
-					if ($placeindex<31) {
-						$px=$x+40*2;
-						$py=($placeindex-15)*12+6;
-					} else {
-						$px=$x+40*2+100*intval(($placeindex-15)/15);
-						$py=($placeindex%15)*12+6;
-					}
-					imagefilledrectangle($im, $px, $py+3, $px-4, $py-3, $color2);
-					imageline($im,$x+$w,$y+$h/2,$px,$py,$color2);
-					imagestring($im,2,$px+2,$py-6,$text,$color1);	
-				}
-			} else {
-				imagestring($im,4,$x+5,$y1-16,$text,$color1);
-			}
-		}
-	}
-
-
-	$size = GRAPH_SIZE; // image size
-	if ($MYREQUEST['IMG']==3)
-		$image = imagecreate(2*$size+150, $size+10);
-	else
-		$image = imagecreate($size+50, $size+10);
-
-	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-	$col_red   = imagecolorallocate($image, 0xD0, 0x60,  0x30);
-	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$col_black = imagecolorallocate($image,   0,   0,   0);
-	imagecolortransparent($image,$col_white);
-
-	switch ($MYREQUEST['IMG']) {
-	
-	case 1:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=$y=$size/2;
-		$fuzz = 0.000001;
-
-		// This block of code creates the pie chart.  It is a lot more complex than you
-		// would expect because we try to visualize any memory fragmentation as well.
-		$angle_from = 0;
-		$string_placement=array();
-		for($i=0; $i<$mem['num_seg']; $i++) {	
-			$ptr = 0;
-			$free = $mem['block_lists'][$i];
-			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$angle_to = $angle_from+($block['offset']-$ptr)/$s;
-					if(($angle_to+$fuzz)>1) $angle_to = 1;
-					if( ($angle_to*360) - ($angle_from*360) >= 1) {
-						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-						if (($angle_to-$angle_from)>0.05) {
-							array_push($string_placement, array($angle_from,$angle_to));
-						}
-					}
-					$angle_from = $angle_to;
-				}
-				$angle_to = $angle_from+($block['size'])/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				if( ($angle_to*360) - ($angle_from*360) >= 1) {
-					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
-					if (($angle_to-$angle_from)>0.05) {
-						array_push($string_placement, array($angle_from,$angle_to));
-					}
-				}
-				$angle_from = $angle_to;
-				$ptr = $block['offset']+$block['size'];
-			}
-			if ($ptr < $mem['seg_size']) { // memory at the end 
-				$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-				if (($angle_to-$angle_from)>0.05) {
-					array_push($string_placement, array($angle_from,$angle_to));
-				}
-			}
-		}
-		foreach ($string_placement as $angle) {
-			text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
-		}
-		break;
-		
-	case 2: 
-		$s=$cache['num_hits']+$cache['num_misses'];
-		$a=$cache['num_hits'];
-		
-		fill_box($image, 30,$size,50,-$a*($size-21)/$s,$col_black,$col_green,sprintf("%.1f%%",$cache['num_hits']*100/$s));
-		fill_box($image,130,$size,50,-max(4,($s-$a)*($size-21)/$s),$col_black,$col_red,sprintf("%.1f%%",$cache['num_misses']*100/$s));
-		break;
-		
-	case 3:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=130;
-		$y=1;
-		$j=1;
-
-		// This block of code creates the bar chart.  It is a lot more complex than you
-		// would expect because we try to visualize any memory fragmentation as well.
-		for($i=0; $i<$mem['num_seg']; $i++) {	
-			$ptr = 0;
-			$free = $mem['block_lists'][$i];
-			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
-					if ($h>0) {
-                                                $j++;
-						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
-                                        }
-					$y+=$h;
-				}
-				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
-				if ($h>0) {
-                                        $j++;
-					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
-					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
-                                }
-				$y+=$h;
-				$ptr = $block['offset']+$block['size'];
-			}
-			if ($ptr < $mem['seg_size']) { // memory at the end 
-				$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
-				if ($h > 0) {
-					fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
-				}
-			}
-		}
-		break;
-	case 4: 
-		$s=$cache['num_hits']+$cache['num_misses'];
-		$a=$cache['num_hits'];
-	        	
-		fill_box($image, 30,$size,50,-$a*($size-21)/$s,$col_black,$col_green,sprintf("%.1f%%",$cache['num_hits']*100/$s));
-		fill_box($image,130,$size,50,-max(4,($s-$a)*($size-21)/$s),$col_black,$col_red,sprintf("%.1f%%",$cache['num_misses']*100/$s));
-		break;
-	
-	}
-	header("Content-type: image/png");
-	imagepng($image);
-	exit;
-}
-
-// pretty printer for byte values
-//
-function bsize($s) {
-	foreach (array('','K','M','G') as $i => $k) {
-		if ($s < 1024) break;
-		$s/=1024;
-	}
-	return sprintf("%5.1f %sBytes",$s,$k);
-}
-
-// sortable table header in "scripts for this host" view
-function sortheader($key,$name,$extra='') {
-	global $MYREQUEST, $MY_SELF_WO_SORT;
-	
-	if ($MYREQUEST['SORT1']==$key) {
-		$MYREQUEST['SORT2'] = $MYREQUEST['SORT2']=='A' ? 'D' : 'A';
-	}
-	return "<a class=sortable href=\"$MY_SELF_WO_SORT$extra&SORT1=$key&SORT2=".$MYREQUEST['SORT2']."\">$name</a>";
-
-}
-
-// create menu entry 
-function menu_entry($ob,$title) {
-	global $MYREQUEST,$MY_SELF;
-	if ($MYREQUEST['OB']!=$ob) {
-		return "<li><a href=\"$MY_SELF&OB=$ob\">$title</a></li>";
-	} else if (empty($MYREQUEST['SH'])) {
-		return "<li><span class=active>$title</span></li>";
-	} else {
-		return "<li><a class=\"child_active\" href=\"$MY_SELF&OB=$ob\">$title</a></li>";	
-	}
-}
-
-function put_login_link($s="Login")
-{
-	global $MY_SELF,$MYREQUEST,$AUTHENTICATED;
-	// needs ADMIN_PASSWORD to be changed!
-	//
-	if (!USE_AUTHENTICATION) {
-		return;
-	} else if (ADMIN_PASSWORD=='password')
-	{
-		print <<<EOB
-			<a href="#" onClick="javascript:alert('You need to set a password at the top of apc.php before this will work!');return false";>$s</a>
-EOB;
-	} else if ($AUTHENTICATED) {
-		print <<<EOB
-			'{$_SERVER['PHP_AUTH_USER']}'&nbsp;logged&nbsp;in!
-EOB;
-	} else{
-		print <<<EOB
-			<a href="$MY_SELF&LO=1&OB={$MYREQUEST['OB']}">$s</a>
-EOB;
-	}
-}
-
-function block_sort($array1, $array2)
-{
-	if ($array1['offset'] > $array2['offset']) {
-		return 1;
-	} else {
-		return -1;
-	}
-}
-
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head><title>APC INFO <?php echo $host ?></title>
-<style><!--
-body { background:white; font-size:100.01%; margin:0; padding:0; }
-body,p,td,th,input,submit { font-size:0.8em;font-family:arial,helvetica,sans-serif; }
-* html body   {font-size:0.8em}
-* html p      {font-size:0.8em}
-* html td     {font-size:0.8em}
-* html th     {font-size:0.8em}
-* html input  {font-size:0.8em}
-* html submit {font-size:0.8em}
-td { vertical-align:top }
-a { color:black; font-weight:none; text-decoration:none; }
-a:hover { text-decoration:underline; }
-div.content { padding:1em 1em 1em 1em; position:absolute; width:97%; z-index:100; }
-
-
-div.head div.login {
-	position:absolute;
-	right: 1em;
-	top: 1.2em;
-	color:white;
-	width:6em;
-	}
-div.head div.login a {
-	position:absolute;
-	right: 0em;
-	background:rgb(119,123,180);
-	border:solid rgb(102,102,153) 2px;
-	color:white;
-	font-weight:bold;
-	padding:0.1em 0.5em 0.1em 0.5em;
-	text-decoration:none;
-	}
-div.head div.login a:hover {
-	background:rgb(193,193,244);
-	}
-
-h1.apc { background:rgb(153,153,204); margin:0; padding:0.5em 1em 0.5em 1em; }
-* html h1.apc { margin-bottom:-7px; }
-h1.apc a:hover { text-decoration:none; color:rgb(90,90,90); }
-h1.apc div.logo span.logo {
-	background:rgb(119,123,180);
-	color:black;
-	border-right: solid black 1px;
-	border-bottom: solid black 1px;
-	font-style:italic;
-	font-size:1em;
-	padding-left:1.2em;
-	padding-right:1.2em;
-	text-align:right;
-	}
-h1.apc div.logo span.name { color:white; font-size:0.7em; padding:0 0.8em 0 2em; }
-h1.apc div.nameinfo { color:white; display:inline; font-size:0.4em; margin-left: 3em; }
-h1.apc div.copy { color:black; font-size:0.4em; position:absolute; right:1em; }
-hr.apc {
-	background:white;
-	border-bottom:solid rgb(102,102,153) 1px;
-	border-style:none;
-	border-top:solid rgb(102,102,153) 10px;
-	height:12px;
-	margin:0;
-	margin-top:1px;
-	padding:0;
-}
-
-ol,menu { margin:1em 0 0 0; padding:0.2em; margin-left:1em;}
-ol.menu li { display:inline; margin-right:0.7em; list-style:none; font-size:85%}
-ol.menu a {
-	background:rgb(153,153,204);
-	border:solid rgb(102,102,153) 2px;
-	color:white;
-	font-weight:bold;
-	margin-right:0em;
-	padding:0.1em 0.5em 0.1em 0.5em;
-	text-decoration:none;
-	margin-left: 5px;
-	}
-ol.menu a.child_active {
-	background:rgb(153,153,204);
-	border:solid rgb(102,102,153) 2px;
-	color:white;
-	font-weight:bold;
-	margin-right:0em;
-	padding:0.1em 0.5em 0.1em 0.5em;
-	text-decoration:none;
-	border-left: solid black 5px;
-	margin-left: 0px;
-	}
-ol.menu span.active {
-	background:rgb(153,153,204);
-	border:solid rgb(102,102,153) 2px;
-	color:black;
-	font-weight:bold;
-	margin-right:0em;
-	padding:0.1em 0.5em 0.1em 0.5em;
-	text-decoration:none;
-	border-left: solid black 5px;
-	}
-ol.menu span.inactive {
-	background:rgb(193,193,244);
-	border:solid rgb(182,182,233) 2px;
-	color:white;
-	font-weight:bold;
-	margin-right:0em;
-	padding:0.1em 0.5em 0.1em 0.5em;
-	text-decoration:none;
-	margin-left: 5px;
-	}
-ol.menu a:hover {
-	background:rgb(193,193,244);
-	text-decoration:none;
-	}
-	
-	
-div.info {
-	background:rgb(204,204,204);
-	border:solid rgb(204,204,204) 1px;
-	margin-bottom:1em;
-	}
-div.info h2 {
-	background:rgb(204,204,204);
-	color:black;
-	font-size:1em;
-	margin:0;
-	padding:0.1em 1em 0.1em 1em;
-	}
-div.info table {
-	border:solid rgb(204,204,204) 1px;
-	border-spacing:0;
-	width:100%;
-	}
-div.info table th {
-	background:rgb(204,204,204);
-	color:white;
-	margin:0;
-	padding:0.1em 1em 0.1em 1em;
-	}
-div.info table th a.sortable { color:black; }
-div.info table tr.tr-0 { background:rgb(238,238,238); }
-div.info table tr.tr-1 { background:rgb(221,221,221); }
-div.info table td { padding:0.3em 1em 0.3em 1em; }
-div.info table td.td-0 { border-right:solid rgb(102,102,153) 1px; white-space:nowrap; }
-div.info table td.td-n { border-right:solid rgb(102,102,153) 1px; }
-div.info table td h3 {
-	color:black;
-	font-size:1.1em;
-	margin-left:-0.3em;
-	}
-
-div.graph { margin-bottom:1em }
-div.graph h2 { background:rgb(204,204,204);; color:black; font-size:1em; margin:0; padding:0.1em 1em 0.1em 1em; }
-div.graph table { border:solid rgb(204,204,204) 1px; color:black; font-weight:normal; width:100%; }
-div.graph table td.td-0 { background:rgb(238,238,238); }
-div.graph table td.td-1 { background:rgb(221,221,221); }
-div.graph table td { padding:0.2em 1em 0.4em 1em; }
-
-div.div1,div.div2 { margin-bottom:1em; width:35em; }
-div.div3 { position:absolute; left:40em; top:1em; width:580px; }
-//div.div3 { position:absolute; left:37em; top:1em; right:1em; }
-
-div.sorting { margin:1.5em 0em 1.5em 2em }
-.center { text-align:center }
-.aright { position:absolute;right:1em }
-.right { text-align:right }
-.ok { color:rgb(0,200,0); font-weight:bold}
-.failed { color:rgb(200,0,0); font-weight:bold}
-
-span.box {
-	border: black solid 1px;
-	border-right:solid black 2px;
-	border-bottom:solid black 2px;
-	padding:0 0.5em 0 0.5em;
-	margin-right:1em;
-}
-span.green { background:#60F060; padding:0 0.5em 0 0.5em}
-span.red { background:#D06030; padding:0 0.5em 0 0.5em }
-
-div.authneeded {
-	background:rgb(238,238,238);
-	border:solid rgb(204,204,204) 1px;
-	color:rgb(200,0,0);
-	font-size:1.2em;
-	font-weight:bold;
-	padding:2em;
-	text-align:center;
-	}
-	
-input {
-	background:rgb(153,153,204);
-	border:solid rgb(102,102,153) 2px;
-	color:white;
-	font-weight:bold;
-	margin-right:1em;
-	padding:0.1em 0.5em 0.1em 0.5em;
-	}
-//-->
-</style>
-</head>
-<body>
-<div class="head">
-	<h1 class="apc">
-		<div class="logo"><span class="logo"><a href="http://pecl.php.net/package/APC">APC</a></span></div>
-		<div class="nameinfo">Opcode Cache</div>
-	</h1>
-	<div class="login">
-	<?php put_login_link(); ?>
-	</div>
-	<hr class="apc">
-</div>
-<?php
-
-
-// Display main Menu
-echo <<<EOB
-	<ol class=menu>
-	<li><a href="$MY_SELF&OB={$MYREQUEST['OB']}&SH={$MYREQUEST['SH']}">Refresh Data</a></li>
-EOB;
-echo
-	menu_entry(1,'View Host Stats'),
-	menu_entry(2,'System Cache Entries');
-if ($AUTHENTICATED) {
-	echo menu_entry(4,'Per-Directory Entries');
-}
-echo
-	menu_entry(3,'User Cache Entries'),
-	menu_entry(9,'Version Check');
-	
-if ($AUTHENTICATED) {
-	echo <<<EOB
-		<li><a class="aright" href="$MY_SELF&CC=1&OB={$MYREQUEST['OB']}" onClick="javascript:return confirm('Are you sure?');">Clear $cache_mode Cache</a></li>
-EOB;
-}
-echo <<<EOB
-	</ol>
-EOB;
-
-
-// CONTENT
-echo <<<EOB
-	<div class=content>
-EOB;
-
-// MAIN SWITCH STATEMENT 
-
-switch ($MYREQUEST['OB']) {
-
-
-
-
-
-// -----------------------------------------------
-// Host Stats
-// -----------------------------------------------
-case OB_HOST_STATS:
-	$mem_size = $mem['num_seg']*$mem['seg_size'];
-	$mem_avail= $mem['avail_mem'];
-	$mem_used = $mem_size-$mem_avail;
-	$seg_size = bsize($mem['seg_size']);
-	$req_rate = sprintf("%.2f",($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time']));
-	$hit_rate = sprintf("%.2f",($cache['num_hits'])/($time-$cache['start_time']));
-	$miss_rate = sprintf("%.2f",($cache['num_misses'])/($time-$cache['start_time']));
-	$insert_rate = sprintf("%.2f",($cache['num_inserts'])/($time-$cache['start_time']));
-	$req_rate_user = sprintf("%.2f",($cache_user['num_hits']+$cache_user['num_misses'])/($time-$cache_user['start_time']));
-	$hit_rate_user = sprintf("%.2f",($cache_user['num_hits'])/($time-$cache_user['start_time']));
-	$miss_rate_user = sprintf("%.2f",($cache_user['num_misses'])/($time-$cache_user['start_time']));
-	$insert_rate_user = sprintf("%.2f",($cache_user['num_inserts'])/($time-$cache_user['start_time']));
-	$apcversion = phpversion('apc');
-	$phpversion = phpversion();
-	$number_files = $cache['num_entries']; 
-    $size_files = bsize($cache['mem_size']);
-	$number_vars = $cache_user['num_entries'];
-    $size_vars = bsize($cache_user['mem_size']);
-	$i=0;
-	echo <<< EOB
-		<div class="info div1"><h2>General Cache Information</h2>
-		<table cellspacing=0><tbody>
-		<tr class=tr-0><td class=td-0>APC Version</td><td>$apcversion</td></tr>
-		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
-EOB;
-
-	if(!empty($_SERVER['SERVER_NAME']))
-		echo "<tr class=tr-0><td class=td-0>APC Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
-	if(!empty($_SERVER['SERVER_SOFTWARE']))
-		echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
-
-	echo <<<EOB
-		<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size 
-    <br/> ({$cache['memory_type']} memory, {$cache['locking_type']} locking)
-    </td></tr>
-EOB;
-	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
-	echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
-	echo <<<EOB
-		</tbody></table>
-		</div>
-
-		<div class="info div1"><h2>File Cache Information</h2>
-		<table cellspacing=0><tbody>
-		<tr class=tr-0><td class=td-0>Cached Files</td><td>$number_files ($size_files)</td></tr>
-		<tr class=tr-1><td class=td-0>Hits</td><td>{$cache['num_hits']}</td></tr>
-		<tr class=tr-0><td class=td-0>Misses</td><td>{$cache['num_misses']}</td></tr>
-		<tr class=tr-1><td class=td-0>Request Rate (hits, misses)</td><td>$req_rate cache requests/second</td></tr>
-		<tr class=tr-0><td class=td-0>Hit Rate</td><td>$hit_rate cache requests/second</td></tr>
-		<tr class=tr-1><td class=td-0>Miss Rate</td><td>$miss_rate cache requests/second</td></tr>
-		<tr class=tr-0><td class=td-0>Insert Rate</td><td>$insert_rate cache requests/second</td></tr>
-		<tr class=tr-1><td class=td-0>Cache full count</td><td>{$cache['expunges']}</td></tr>
-		</tbody></table>
-		</div>
-
-		<div class="info div1"><h2>User Cache Information</h2>
-		<table cellspacing=0><tbody>
-    <tr class=tr-0><td class=td-0>Cached Variables</td><td>$number_vars ($size_vars)</td></tr>
-		<tr class=tr-1><td class=td-0>Hits</td><td>{$cache_user['num_hits']}</td></tr>
-		<tr class=tr-0><td class=td-0>Misses</td><td>{$cache_user['num_misses']}</td></tr>
-		<tr class=tr-1><td class=td-0>Request Rate (hits, misses)</td><td>$req_rate_user cache requests/second</td></tr>
-		<tr class=tr-0><td class=td-0>Hit Rate</td><td>$hit_rate_user cache requests/second</td></tr>
-		<tr class=tr-1><td class=td-0>Miss Rate</td><td>$miss_rate_user cache requests/second</td></tr>
-		<tr class=tr-0><td class=td-0>Insert Rate</td><td>$insert_rate_user cache requests/second</td></tr>
-		<tr class=tr-1><td class=td-0>Cache full count</td><td>{$cache_user['expunges']}</td></tr>
-
-		</tbody></table>
-		</div>
-
-		<div class="info div2"><h2>Runtime Settings</h2><table cellspacing=0><tbody>
-EOB;
-
-	$j = 0;
-	foreach (ini_get_all('apc') as $k => $v) {
-		echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
-		$j = 1 - $j;
-	}
-
-	if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
-		$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
-	else
-		$mem_note = "Memory Usage";
-
-	echo <<< EOB
-		</tbody></table>
-		</div>
-
-		<div class="graph div3"><h2>Host Status Diagrams</h2>
-		<table cellspacing=0><tbody>
-EOB;
-	$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
-	echo <<<EOB
-		<tr>
-		<td class=td-0>$mem_note</td>
-		<td class=td-1>Hits &amp; Misses</td>
-		</tr>
-EOB;
-
-	echo
-		graphics_avail() ? 
-			  '<tr>'.
-			  "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF?IMG=1&$time\"></td>".
-			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
-			: "",
-		'<tr>',
-		'<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
-		'</tr>',
-		'<tr>',
-		'<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used ).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
-	echo <<< EOB
-		</tr>
-		</tbody></table>
-
-		<br/>
-		<h2>Detailed Memory Usage and Fragmentation</h2>
-		<table cellspacing=0><tbody>
-		<tr>
-		<td class=td-0 colspan=2><br/>
-EOB;
-
-	// Fragementation: (freeseg - 1) / total_seg
-	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for($i=0; $i<$mem['num_seg']; $i++) {
-		$ptr = 0;
-		foreach($mem['block_lists'][$i] as $block) {
-			if ($block['offset'] != $ptr) {
-				++$nseg;
-			}
-			$ptr = $block['offset'] + $block['size'];
-                        /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
-                        $freetotal+=$block['size'];
-		}
-		$freeseg += count($mem['block_lists'][$i]);
-	}
-	
-	if ($freeseg > 1) {
-		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
-	} else {
-		$frag = "0%";
-	}
-
-	if (graphics_avail()) {
-		$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
-		echo <<<EOB
-			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
-EOB;
-	}
-	echo <<<EOB
-		</br>Fragmentation: $frag
-		</td>
-		</tr>
-EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
-            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
-            else $range = "$cur - $nxt";
-            echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
-          }
-        }
-        echo <<<EOB
-		</tbody></table>
-		</div>
-EOB;
-		
-	break;
-
-
-// -----------------------------------------------
-// User Cache Entries
-// -----------------------------------------------
-case OB_USER_CACHE:
-	if (!$AUTHENTICATED) {
-    echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
-		put_login_link("Login now!");
-		echo '</div>';
-		break;
-	}
-	$fieldname='info';
-	$fieldheading='User Entry Label';
-	$fieldkey='info';
-
-// -----------------------------------------------
-// System Cache Entries		
-// -----------------------------------------------
-case OB_SYS_CACHE:	
-	if (!isset($fieldname))
-	{
-		$fieldname='filename';
-		$fieldheading='Script Filename';
-		if(ini_get("apc.stat")) $fieldkey='inode';
-		else $fieldkey='filename'; 
-	}
-	if (!empty($MYREQUEST['SH']))
-	{
-		echo <<< EOB
-			<div class="info"><table cellspacing=0><tbody>
-			<tr><th>Attribute</th><th>Value</th></tr>
-EOB;
-
-		$m=0;
-		foreach($scope_list as $j => $list) {
-			foreach($cache[$list] as $i => $entry) {
-				if (md5($entry[$fieldkey])!=$MYREQUEST['SH']) continue;
-				foreach($entry as $k => $value) {
-					if (!$AUTHENTICATED) {
-						// hide all path entries if not logged in
-						$value=preg_replace('/^.*(\\/|\\\\)/','<i>&lt;hidden&gt;</i>/',$value);
-					}
-
-					if ($k == "num_hits") {
-						$value=sprintf("%s (%.2f%%)",$value,$value*100/$cache['num_hits']);
-					}
-					if ($k == 'deletion_time') {
-						if(!$entry['deletion_time']) $value = "None";
-					}
-					echo
-						"<tr class=tr-$m>",
-						"<td class=td-0>",ucwords(preg_replace("/_/"," ",$k)),"</td>",
-						"<td class=td-last>",(preg_match("/time/",$k) && $value!='None') ? date(DATE_FORMAT,$value) : htmlspecialchars($value, ENT_QUOTES, 'UTF-8'),"</td>",
-						"</tr>";
-					$m=1-$m;
-				}
-				if($fieldkey=='info') {
-					echo "<tr class=tr-$m><td class=td-0>Stored Value</td><td class=td-last><pre>";
-					$output = var_export(apc_fetch($entry[$fieldkey]),true);
-					echo htmlspecialchars($output, ENT_QUOTES, 'UTF-8');
-					echo "</pre></td></tr>\n";
-				}
-				break;
-			}
-		}
-
-		echo <<<EOB
-			</tbody></table>
-			</div>
-EOB;
-		break;
-	}
-
-	$cols=6;
-	echo <<<EOB
-		<div class=sorting><form>Scope:
-		<input type=hidden name=OB value={$MYREQUEST['OB']}>
-		<select name=SCOPE>
-EOB;
-	echo 
-		"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
-		"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
-		"</select>",
-		", Sorting:<select name=SORT1>",
-		"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
-		"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
-		"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
-		"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
-		"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
-		"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
-		"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
-	if($fieldname=='info') echo
-		"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
-	echo 
-		'</select>',
-		'<select name=SORT2>',
-		'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
-		'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
-		'</select>',
-		'<select name=COUNT onChange="form.submit()">',
-		'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
-		'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
-		'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
-		'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
-		'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
-		'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
-		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
-		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
-		'</select>',
-    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
-		'&nbsp;<input type=submit value="GO!">',
-		'</form></div>';
-
-  if (isset($MYREQUEST['SEARCH'])) {
-   // Don't use preg_quote because we want the user to be able to specify a
-   // regular expression subpattern.
-   $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
-   if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
-     echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
-     break;
-   }
-  }
-
-  echo
-		'<div class="info"><table cellspacing=0><tbody>',
-		'<tr>',
-		'<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
-
-	if($fieldname=='info') {
-		$cols+=2;
-		 echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
-	}
-	echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
-
-	// builds list with alpha numeric sortable keys
-	//
-	$list = array();
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
-			case 'A': $k=sprintf('%015d-',$entry['access_time']); 	break;
-			case 'H': $k=sprintf('%015d-',$entry['num_hits']); 		break;
-			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 		break;
-			case 'M': $k=sprintf('%015d-',$entry['mtime']);			break;
-			case 'C': $k=sprintf('%015d-',$entry['creation_time']);	break;
-			case 'T': $k=sprintf('%015d-',$entry['ttl']);			break;
-			case 'D': $k=sprintf('%015d-',$entry['deletion_time']);	break;
-			case 'S': $k='';										break;
-		}
-		if (!$AUTHENTICATED) {
-			// hide all path entries if not logged in
-			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
-		} else {
-			$list[$k.$entry[$fieldname]]=$entry;
-		}
-	}
-
-	if ($list) {
-		
-		// sort list
-		//
-		switch ($MYREQUEST['SORT2']) {
-			case "A":	krsort($list);	break;
-			case "D":	ksort($list);	break;
-		}
-		
-		// output list
-		$i=0;
-		foreach($list as $k => $entry) {
-      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {  
-        $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
-        echo
-          '<tr class=tr-',$i%2,'>',
-          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",md5($entry[$fieldkey]),"\">",$field_value,'</a></td>',
-          '<td class="td-n center">',$entry['num_hits'],'</td>',
-          '<td class="td-n right">',$entry['mem_size'],'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
-
-        if($fieldname=='info') {
-          if($entry['ttl'])
-            echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
-          else
-            echo '<td class="td-n center">None</td>';
-        }
-        if ($entry['deletion_time']) {
-
-          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
-        } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
-
-          echo '<td class="td-last center">';
-          echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
-          echo '</td>';
-        } else {
-          echo '<td class="td-last center"> &nbsp; </td>';
-        }
-        echo '</tr>';
-        $i++;
-        if ($i == $MYREQUEST['COUNT'])
-          break;
-      }
-		}
-		
-	} else {
-		echo '<tr class=tr-0><td class="center" colspan=',$cols,'><i>No data</i></td></tr>';
-	}
-	echo <<< EOB
-		</tbody></table>
-EOB;
-
-	if ($list && $i < count($list)) {
-		echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
-	}
-
-	echo <<< EOB
-		</div>
-EOB;
-	break;
-
-
-// -----------------------------------------------
-// Per-Directory System Cache Entries
-// -----------------------------------------------
-case OB_SYS_CACHE_DIR:	
-	if (!$AUTHENTICATED) {
-		break;
-	}
-
-	echo <<<EOB
-		<div class=sorting><form>Scope:
-		<input type=hidden name=OB value={$MYREQUEST['OB']}>
-		<select name=SCOPE>
-EOB;
-	echo 
-		"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
-		"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
-		"</select>",
-		", Sorting:<select name=SORT1>",
-		"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Total Hits</option>",
-		"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Total Size</option>",
-		"<option value=T",$MYREQUEST['SORT1']=='T' ? " selected":"",">Number of Files</option>",
-		"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">Directory Name</option>",
-		"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Avg. Size</option>",
-		"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Avg. Hits</option>",
-		'</select>',
-		'<select name=SORT2>',
-		'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
-		'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
-		'</select>',
-		'<select name=COUNT onChange="form.submit()">',
-		'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
-		'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
-		'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
-		'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
-		'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
-		'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
-		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
-		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
-		'</select>',
-		", Group By Dir Level:<select name=AGGR>",
-		"<option value='' selected>None</option>";
-		for ($i = 1; $i < 10; $i++)
-			echo "<option value=$i",$MYREQUEST['AGGR']==$i ? " selected":"",">$i</option>";
-		echo '</select>',
-		'&nbsp;<input type=submit value="GO!">',
-		'</form></div>',
-
-		'<div class="info"><table cellspacing=0><tbody>',
-		'<tr>',
-		'<th>',sortheader('S','Directory Name',	"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('T','Number of Files',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('H','Total Hits',	"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('Z','Total Size',	"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('C','Avg. Hits',	"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('A','Avg. Size',	"&OB=".$MYREQUEST['OB']),'</th>',
-		'</tr>';
-
-	// builds list with alpha numeric sortable keys
-	//
-	$tmp = $list = array();
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $entry) {
-		$n = dirname($entry['filename']);
-		if ($MYREQUEST['AGGR'] > 0) {
-			$n = preg_replace("!^(/?(?:[^/\\\\]+[/\\\\]){".($MYREQUEST['AGGR']-1)."}[^/\\\\]*).*!", "$1", $n);
-		}
-		if (!isset($tmp[$n])) {
-			$tmp[$n] = array('hits'=>0,'size'=>0,'ents'=>0);
-		}
-		$tmp[$n]['hits'] += $entry['num_hits'];
-		$tmp[$n]['size'] += $entry['mem_size'];
-		++$tmp[$n]['ents'];
-	}
-
-	foreach ($tmp as $k => $v) {
-		switch($MYREQUEST['SORT1']) {
-			case 'A': $kn=sprintf('%015d-',$v['size'] / $v['ents']);break;
-			case 'T': $kn=sprintf('%015d-',$v['ents']);		break;
-			case 'H': $kn=sprintf('%015d-',$v['hits']);		break;
-			case 'Z': $kn=sprintf('%015d-',$v['size']);		break;
-			case 'C': $kn=sprintf('%015d-',$v['hits'] / $v['ents']);break;
-			case 'S': $kn = $k;					break;
-		}
-		$list[$kn.$k] = array($k, $v['ents'], $v['hits'], $v['size']);
-	}
-
-	if ($list) {
-		
-		// sort list
-		//
-		switch ($MYREQUEST['SORT2']) {
-			case "A":	krsort($list);	break;
-			case "D":	ksort($list);	break;
-		}
-		
-		// output list
-		$i = 0;
-		foreach($list as $entry) {
-			echo
-				'<tr class=tr-',$i%2,'>',
-				"<td class=td-0>",$entry[0],'</a></td>',
-				'<td class="td-n center">',$entry[1],'</td>',
-				'<td class="td-n center">',$entry[2],'</td>',
-				'<td class="td-n center">',$entry[3],'</td>',
-				'<td class="td-n center">',round($entry[2] / $entry[1]),'</td>',
-				'<td class="td-n center">',round($entry[3] / $entry[1]),'</td>',
-				'</tr>';
-
-			if (++$i == $MYREQUEST['COUNT']) break;
-		}
-		
-	} else {
-		echo '<tr class=tr-0><td class="center" colspan=6><i>No data</i></td></tr>';
-	}
-	echo <<< EOB
-		</tbody></table>
-EOB;
-
-	if ($list && $i < count($list)) {
-		echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
-	}
-
-	echo <<< EOB
-		</div>
-EOB;
-	break;
-
-// -----------------------------------------------
-// Version check
-// -----------------------------------------------
-case OB_VERSION_CHECK:
-	echo <<<EOB
-		<div class="info"><h2>APC Version Information</h2>
-		<table cellspacing=0><tbody>
-		<tr>
-		<th></th>
-		</tr>
-EOB;
-  if (defined('PROXY')) {
-    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apc.rss", False, $ctxt);
-  } else {
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apc.rss");
-  }
-	if (!$rss) {
-		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
-	} else {
-		$apcversion = phpversion('apc');
-
-		preg_match('!<title>APC ([0-9.]+)</title>!', $rss, $match);
-		echo '<tr class="tr-0 center"><td>';
-		if (version_compare($apcversion, $match[1], '>=')) {
-			echo '<div class="ok">You are running the latest version of APC ('.$apcversion.')</div>';
-			$i = 3;
-		} else {
-			echo '<div class="failed">You are running an older version of APC ('.$apcversion.'), 
-				newer version '.$match[1].' is available at <a href="http://pecl.php.net/package/APC/'.$match[1].'">
-				http://pecl.php.net/package/APC/'.$match[1].'</a>
-				</div>';
-			$i = -1;
-		}
-		echo '</td></tr>';
-		echo '<tr class="tr-0"><td><h3>Change Log:</h3><br/>';
-
-		preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
-		next($match[2]); next($match[2]);
-
-		while (list(,$v) = each($match[2])) {
-			list(,$ver) = explode(' ', $v, 2);
-			if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
-				break;
-			} else if (!$i--) {
-				break;
-			}
-			echo "<b><a href=\"http://pecl.php.net/package/APC/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";
-			echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."</blockquote>";
-			next($match[2]);
-		}
-		echo '</td></tr>';
-	}
-	echo <<< EOB
-		</tbody></table>
-		</div>
-EOB;
-	break;
-
-}
-
-echo <<< EOB
-	</div>
-EOB;
-
-?>
-
-<!-- <?php echo "\nBased on APCGUI By R.Becker\n$VERSION\n"?> -->
-</body>
-</html>
diff --git a/application/scripts/configuration/modules/apache2/files/odbctest.php b/application/scripts/configuration/modules/apache2/files/odbctest.php
deleted file mode 100644
index 2e4ce0df8..000000000
--- a/application/scripts/configuration/modules/apache2/files/odbctest.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$conn   = odbc_connect('VOS', 'dba', 'dba');
-echo odbc_errormsg();
-$query  = 'SELECT DISTINCT ?g WHERE {GRAPH ?g {?s ?p ?o.}}';
-$result = odbc_exec($conn, 'CALL DB.DBA.SPARQL_EVAL(\'' . $query . '\', NULL, 0)');
-?>
-<ul>
-<?php while (odbc_fetch_row($result)): ?>
-    <li><?php echo odbc_result($result, 1) ?></li>
-<?php endwhile; ?>
-</ul>
diff --git a/application/scripts/configuration/modules/apache2/files/phpinfo.php b/application/scripts/configuration/modules/apache2/files/phpinfo.php
deleted file mode 100644
index 61ace196d..000000000
--- a/application/scripts/configuration/modules/apache2/files/phpinfo.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-phpinfo();
diff --git a/application/scripts/configuration/modules/apache2/manifests/init.pp b/application/scripts/configuration/modules/apache2/manifests/init.pp
deleted file mode 100644
index 765d86dde..000000000
--- a/application/scripts/configuration/modules/apache2/manifests/init.pp
+++ /dev/null
@@ -1,78 +0,0 @@
-class apache2 {
-
-    $ow_server_name         = $ubuntu::ow_server_name
-    $ow_application_env     = $ubuntu::ow_application_env
-    $ow_document_root       = "/vagrant"
-    
-    # apache2
-    package { 'apache2':
-        ensure => installed
-    }
-
-    file { '/etc/apache2/sites-available/001-ontowiki':
-        ensure => present,
-        content => template("apache2/001-ontowiki"),
-        replace => true,
-        require => Package["apache2"]
-    }
-    
-    # copy/remove files from default /var/www directory
-    file { "/var/www/phpinfo.php":
-        ensure => present,
-        replace => true,
-        owner   => "root",
-        group   => "root",
-        mode    => "0755",
-        source => "puppet:///modules/apache2/phpinfo.php",
-        require => Package["apache2"]
-    }
-    file { "/var/www/odbctest.php":
-        ensure => present,
-        replace => true,
-        owner   => "root",
-        group   => "root",
-        mode    => "0755",
-        source => "puppet:///modules/apache2/odbctest.php",
-        require => Package["apache2"]
-    }
-    file { "/var/www/apc.php":
-        ensure => present,
-        replace => true,
-        owner   => "root",
-        group   => "root",
-        mode    => "0755",
-        source => "puppet:///modules/apache2/apc.php",
-        require => Package["apache2"]
-    }
-    
-    # enable modules and sites
-    exec { "enable-mod-rewrite":
-        command => "/usr/sbin/a2enmod rewrite",
-        creates => "/etc/apache2/mods-enabled/rewrite.load",
-        require => Package["apache2"],
-    }
-    #exec { "enable-mod-proxy":
-    #    command => "/usr/sbin/a2enmod proxy",
-    #    creates => "/etc/apache2/mods-enabled/proxy.load",
-    #    require => Package["apache2"],
-    #}
-    #exec { "enable-mod-proxy_http":
-    #    command => "/usr/sbin/a2enmod proxy_http",
-    #    creates => "/etc/apache2/mods-enabled/proxy_http.load",
-    #    require => Package["apache2"],
-    #}
-    exec { "enable-ontowiki":
-        path => ["/bin", "/usr/bin"],
-        command => "/usr/sbin/a2ensite 001-ontowiki ; /etc/init.d/apache2 restart",
-        creates => "/etc/apache2/sites-enabled/001-ontowiki",
-        require => [Exec["enable-mod-rewrite"], File["/etc/apache2/sites-available/001-ontowiki"]],
-    }
-    
-    # enable apache2 server
-    service { "apache2":
-        ensure => running,
-        enable => true,
-        hasrestart => true,
-        require => Package["apache2"],
-    }
-}
diff --git a/application/scripts/configuration/modules/apache2/templates/001-ontowiki b/application/scripts/configuration/modules/apache2/templates/001-ontowiki
deleted file mode 100644
index 7528eba0d..000000000
--- a/application/scripts/configuration/modules/apache2/templates/001-ontowiki
+++ /dev/null
@@ -1,27 +0,0 @@
-<VirtualHost *:80>
-        ServerName  <%= ow_server_name %>
-        SetEnv APPLICATION_ENV "<%= ow_application_env %>"
-        SetEnv VAGRANT "yes"
-
-        DocumentRoot "<%= ow_document_root %>"
-
-        <Directory <%= ow_document_root %>>
-                Options FollowSymLinks -ExecCGI -Indexes
-                AllowOverride all
-                Order allow,deny
-                Allow from all
-
-            <IfModule mod_php5.c>
-                php_value upload_max_filesize 20M
-                php_value post_max_size 20M
-                php_value error_reporting "E_ALL | E_STRICT"
-            </IfModule>
-        </Directory>
-
-        # %h (Remote host), %u (Remote user), %t (time), %r (first line of reqest),
-        # %>s (status last request), %b (bytes), %{Referer}i (Referer header), 
-        # %{User-agent} (User-agent header), %T (time to serve request), %f (filename)
-        LogFormat "%h %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %T \"%f\"" ow
-        ErrorLog <%= "#{ow_document_root}/logs/#{ow_server_name}_error.log" %>
-        CustomLog <%= "#{ow_document_root}/logs/#{ow_server_name}_access.log ow" %>
-</VirtualHost>
diff --git a/application/scripts/configuration/modules/bootstrap/files/aliases.zsh b/application/scripts/configuration/modules/bootstrap/files/aliases.zsh
deleted file mode 100644
index a2b3de52a..000000000
--- a/application/scripts/configuration/modules/bootstrap/files/aliases.zsh
+++ /dev/null
@@ -1,144 +0,0 @@
-# @author     Sebastian Tramp <mail@sebastian.tramp.name>
-# @license    http://opensource.org/licenses/gpl-license.php
-#
-# alias definitions which can be edited/modified with 'aedit'
-#
-
-export EDITOR="vim"
-alias vi="vim"
-alias aedit=" $EDITOR $ZSH_CONFG/aliases.zsh; source $ZSH_CONFIG/aliases.zsh"
-alias fedit=" $EDITOR $ZSH_CONFG/functions.zsh; source $ZSH_CONFIG/functions.zsh"
-alias pedit=" $EDITOR $ZSH_CONFIG/private.zsh; source $ZSH_CONFIG/private.zsh"
-
-#alias man="unset PAGER; man"
-alias grep='grep --color=auto'
-
-alias sign='gpg --detach-sign --armor'
-alias j=' j'
-
-##### standard aliases (start with a space to be ignored in history)
-# default ls is untouched, except coloring
-alias ls=' ls --color=auto'
-alias myls=' ls -C -F -h --color=always'
-alias l=" myls -l"
-alias ll=' myls -l'
-alias la=' myls -lA'
-alias v=" clear; ll -gh"    # standard directory view
-alias vs=" v **/*(.)"         # show all files in all subdirs plain in a list
-
-alias p=' ps aux | grep'
-alias g='git'
-alias d=' dirs -v'
-alias ka="killall"
-
-alias cd=' cd'
-alias ..=' cd ..; ls'
-alias ...=' cd ..; cd ..; ls'
-alias ....=' cd ..; cd ..; cd ..; ls'
-alias cd..='..'
-alias cd...='...'
-alias cd....='....'
-
-# alias to create a next-link in your home to tag the current workingdir
-alias linkthis='rm -f ~/next; ln -s $PWD ~/next'
-
-##### global aliases
-# zsh buch s.82 (z.B. find / ... NE)
-alias -g NE='2>|/dev/null'
-alias -g NO='&>|/dev/null'
-
-# http://rayninfo.co.uk/tips/zshtips.html
-alias -g G='| grep -'
-alias -g P='2>&1 | $PAGER'
-alias -g L='| less'
-alias -g M='| most'
-alias -g C='| wc -l'
-
-# http://www.commandlinefu.com/commands/view/7284/zsh-suffix-to-inform-you-about-long-command-ending
-# zsh suffix to inform you about long command ending make, Just add "R" (without quotes) suffix to it and you can do other things: 
-# zsh will inform you when you can see the results.
-#alias -g R=' &; jobs | tail -1 | read A0 A1 A2 cmd; echo "running $cmd"; fg "$cmd"; zenity --info --text "$cmd done"; unset A0 A1 A2 cmd'
-
-##### suffix aliases (mostly mapped to open which runs the gnome/kde default app)
-
-alias -s tex="rubber --inplace --maxerr -1 --short --force --warn all --pdf"
-
-alias -s 1="man -l"
-alias -s 2="man -l"
-alias -s 3="man -l"
-alias -s 4="man -l"
-alias -s 5="man -l"
-alias -s 6="man -l"
-alias -s 7="man -l"
-alias -s pdf="open"
-alias -s PDF="open"
-alias -s xoj="xournal"
-
-alias -s htm="$BROWSER"
-alias -s html="$BROWSER"
-alias -s jar="java -jar"
-alias -s deb="sudo dpkg -i"
-
-alias -s iso="vlc"
-alias -s avi=" open"
-alias -s AVI=" open"
-alias -s mov=" open"
-alias -s mpg=" open"
-alias -s m4v=" open"
-alias -s mp4=" open"
-alias -s rmvb=" open"
-alias -s MP4=" open"
-alias -s ogg=" open"
-alias -s ogv=" open"
-alias -s flv=" open"
-alias -s mkv=" open"
-alias -s wav=" open"
-
-alias -s tif="open"
-alias -s tiff="open"
-alias -s png="open"
-alias -s jpg="open"
-alias -s jpeg="open"
-alias -s JPG="open"
-alias -s gif="open"
-alias -s svg="open"
-alias -s psd="open"
-
-alias -s com="open"
-alias -s de="open"
-alias -s org="open"
-
-alias -s rdf="rapper --count"
-alias -s owl="rapper --count"
-alias -s ttl="rapper -i turtle --count"
-alias -s tt="rapper -i turtle --count"
-alias -s n3="rapper -i turtle --count"
-alias -s nt="rapper -i ntriples --count"
-alias -s ntriples="rapper -i ntriples --count"
-alias -s ntriple="rapper -i ntriples --count"
-
-alias -s ods="open"
-alias -s xls="open"
-alias -s xlsx="open"
-alias -s csv="open"
-
-alias -s pot="open"
-alias -s odt="open"
-alias -s doc="open"
-alias -s docx="open"
-alias -s rtf="open"
-alias -s dot="open"
-
-alias -s ppt="open"
-alias -s pptx="open"
-alias -s odp="open"
-
-alias -s plist="plutil"
-
-alias -s sla="open"
-
-alias -s exe="open"
-
-alias -s tjp="tj3"
-alias -s asc="gpg"
-
diff --git a/application/scripts/configuration/modules/bootstrap/files/environment.zsh b/application/scripts/configuration/modules/bootstrap/files/environment.zsh
deleted file mode 100644
index e9c1914b7..000000000
--- a/application/scripts/configuration/modules/bootstrap/files/environment.zsh
+++ /dev/null
@@ -1,20 +0,0 @@
-# @author     Sebastian Tramp <mail@sebastian.tramp.name>
-# @license    http://opensource.org/licenses/gpl-license.php
-#
-# Basic environment settings related to the zsh compiliation (not private)
-
-# XDG Base Directory Specification
-# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CACHE_HOME="$HOME/.cache"
-export ZSH_CONFIG="$XDG_CONFIG_HOME/zsh"
-export ZSH_CACHE="$XDG_CACHE_HOME/zsh"
-mkdir -p $ZSH_CACHE
-
-# executable search path
-export PATH=/usr/local/sbin:$PATH
-export PATH=$HOME/.local/bin:$PATH
-export PATH=$HOME/.local/sbin:$PATH
-
-# https://github.com/mxcl/homebrew/issues/11182
-export PYTHONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
diff --git a/application/scripts/configuration/modules/bootstrap/files/options.zsh b/application/scripts/configuration/modules/bootstrap/files/options.zsh
deleted file mode 100644
index b7efa5ed8..000000000
--- a/application/scripts/configuration/modules/bootstrap/files/options.zsh
+++ /dev/null
@@ -1,68 +0,0 @@
-# @author     Sebastian Tramp <mail@sebastian.tramp.name>
-# @license    http://opensource.org/licenses/gpl-license.php
-#
-# shell options as history size, keyindings, etc
-#
-
-export GREP_OPTIONS='--binary-files=without-match --ignore-case'
-
-# keybindings Strg+v is your friend :-)
-bindkey "^[[1;5D" .backward-word
-bindkey "^[[1;5C" .forward-word
-bindkey "^[[1;6D" backward-delete-word
-bindkey "^[[1;6C" delete-word
-# alt+left (on mac) deletes word
-bindkey "^[" backward-kill-word
-# fn-left
-bindkey "^[[H" .backward-word
-# fn-right
-bindkey "^[[F" .forward-word
-
-# arrow up/down searches in history if line is already started
-bindkey '^[[A' up-line-or-search
-bindkey '^[[B' down-line-or-search
-
-# History Settings (big history for use with many open shells and no dups)
-# Different History files for root and standard user
-if (( ! EUID )); then
-    HISTFILE=$ZSH_CACHE/history_root
-else
-    HISTFILE=$ZSH_CACHE/history
-fi
-SAVEHIST=10000
-HISTSIZE=12000
-setopt share_history append_history extended_history hist_no_store hist_ignore_all_dups hist_ignore_space
-
-# 2x control is completion from history!!!
-zle -C hist-complete complete-word _generic
-zstyle ':completion:hist-complete:*' completer _history
-bindkey '^X^X' hist-complete
-
-# If a command is issued that can’t be executed as a normal command, and the command is the name of a directory, perform the cd command to that directory.
-setopt AUTO_CD
-
-# Treat  the ‘#’, ‘~’ and ‘^’ characters as part of patterns for filename generation, etc.  (An initial unquoted ‘~’ always produces named directory expansion.)
-setopt EXTENDED_GLOB
-
-# If a pattern for filename generation has no matches, print an error, instead of leaving it unchanged in the argument  list. This also applies to file expansion of an initial ‘~’ or ‘=’.
-setopt NOMATCH
-
-# no Beep on error in ZLE.
-setopt NO_BEEP
-
-# Remove  any right prompt from display when accepting a command line. This may be useful with terminals with other cut/paste methods.
-setopt TRANSIENT_RPROMPT
-
-# If unset, the cursor is set to the end of the word if completion is started. Otherwise it stays there and completion is done from both ends.
-setopt COMPLETE_IN_WORD
-
-# Make cd push the old directory onto the directory stack.
-setopt AUTO_PUSHD
-
-# Don’t push multiple copies of the same directory onto the directory stack.
-setopt PUSHD_IGNORE_DUPS
-
-# DON NOT Allow ‘>’ redirection to truncate existing files, and ‘>>’ to create files. Otherwise ‘>!’ or ‘>|’ must be used to truncate  a file, and ‘>>!’ or ‘>>|’ to create a file.
-setopt no_clobber
-
-
diff --git a/application/scripts/configuration/modules/bootstrap/files/prompt.zsh b/application/scripts/configuration/modules/bootstrap/files/prompt.zsh
deleted file mode 100644
index b639686e8..000000000
--- a/application/scripts/configuration/modules/bootstrap/files/prompt.zsh
+++ /dev/null
@@ -1,142 +0,0 @@
-# enable hook method
-autoload add-zsh-hook
-
-# enable and configure vcs_info
-autoload -Uz vcs_info
-add-zsh-hook precmd vcs_info
-zstyle ':vcs_info:*' enable hg git cvs svn
-zstyle ':vcs_info:*' formats '%s|%b|%a|%i|%R|%r|%S|%m'
-
-# my prompt theme
-function promptSetup () {
-    setopt prompt_subst
-    local TERMWIDTH
-    (( TERMWIDTH = ${COLUMNS} - 1 ))
-
-    NOCOLOR="%{$terminfo[sgr0]%}"
-    PS1=''; RPS1=''
-    PS2="↷ %_>"; RPS2=''
-    PS3="↷ ?#"; RPS3=''
-    PS4="↷ +i>"; RPS3=''
-
-    # prepare vcs info
-    VCS_LINE=''
-    VCS=$vcs_info_msg_0_
-    VCS_TYPE=$VCS[(ws:|:)1]
-    VCS_BRANCH=$VCS[(ws:|:)2]
-    VCS_CHANGES=''
-
-    # setup the prompt sign
-    if [[ $VCS_TYPE != '' ]]; then
-        VCS_LINE+=$NOCOLOR
-        VCS_LINE+='➜ '
-        case $VCS_TYPE in
-            'hg')
-                VCS_LINE+='☿ '
-                VCS_CHANGES=`hg st 2>/dev/null | wc -l`
-                ;;
-            'git')
-                VCS_LINE+='± '
-                ;;
-            *)
-                VCS_LINE+="$VCS_TYPE "
-                ;;
-        esac
-    fi
-
-    VCS_LINE+=$VCS_BRANCH
-
-    if [[ $VCS_CHANGES > 0 ]]; then
-        VCS_LINE+="%F{166}%B"
-        VCS_LINE+=' ★ '
-        VCS_LINE+=$VCS_CHANGES
-    fi
-
-    # rootshell gets another prompt sign
-    CURRENT_USER=`whoami`
-    PR_SIGN=$NOCOLOR
-    PR_SIGN+="%F{160}%B"
-
-    # prepend the hostname if we are outside
-    if [[ "$MYHOSTEXPRESSION" == "" ]]; then
-        # if not set, home is nowhere
-        MYHOSTEXPRESSION="^$"
-    fi
-    if [[ "`hostname`" =~ "$MYHOSTEXPRESSION" ]]; then
-        # we are on our home desktop
-    else
-        # we are outside on a server
-        PR_SIGN+="`hostname` "
-    fi
-
-    # setup the main sign
-    if [[ $CURRENT_USER == 'root' ]]; then
-        PR_SIGN+="☠"
-    elif [[ $CURRENT_USER == 'vagrant' ]]; then
-        PR_SIGN+="𝓥"
-    else
-        PR_SIGN+="∴"
-    fi
-
-    PR_SIGN+="%F{white}%b"
-
-
-
-    # http://unix.stackexchange.com/questions/1022/is-it-possible-to-display-stuff-below-the-prompt-at-a-prompt
-    terminfo_down_sc=$terminfo[cud1]$terminfo[cuu1]$terminfo[sc]$terminfo[cud1]
-
-    # Finally, the prompt.
-    PS1=$'\n'                     # newline (specially quotet, see zsh FAQ 3.13)
-    PS1+="%{$terminfo_down_sc$VCS_LINE$terminfo[rc]%}" # the second line
-    PS1+=$PR_STITLE               # tmux title if present
-    PS1+=$PR_VCSSIGN              # version control part if present
-    PS1+=%(?..'%F{136}%B%'?)       # output last error number if present
-    PS1+=$PR_SIGN                 # the user sign
-    PS1+=" "                      # an additional space
-
-    # reset the tmux title
-    promptSetMultiplexerTabTitle "zsh"
-}
-add-zsh-hook precmd promptSetup
-
-# set a tmux / screen 'tabulator' title if needed
-function promptSetMultiplexerTabTitle () {
-    if [[ "$TERM" == "screen" ]]; then
-        if [[ "$1" == "" ]]; then
-            local CMD=${1[(wr)^(*=*|sudo|-*)]}
-            echo -n "\ekttt$CMD\e\\"
-        else
-            local title="$1 ttt" # I dont know how to prevent errors on one word strings
-            title=$title[(w)1]
-            echo -n "\ek$title\e\\"
-        fi
-    fi
-}
-add-zsh-hook preexec promptSetMultiplexerTabTitle
-
-# setup tmux environment (context + status)
-# TODO: shorten the path variable
-# TODO: remove sudo if available...
-function tmuxChangeDirectory () {
-    # set the tmux status line
-    if [[ "$TMUX" != "" ]]; then
-        newMailCountTool="/home/seebi/bin/scripts/newMailCount.py"
-        tmux set-option -g status-right "$PWD ✉ #($newMailCountTool $MAIL)" | tee >/dev/null
-    fi
-
-    if [[ $VCS_TYPE == 'hg' ]]; then
-        #tmux kill-pane -t 1
-        #tmux split-window -h -l 40 "while true; do clear; date; echo; hg xlog-small -l 5 || exit; sleep 600; done;"
-        #tmux select-pane -t 0
-    fi
-}
-add-zsh-hook chpwd tmuxChangeDirectory
-
-# remove the line after the prompt on execution
-# http://unix.stackexchange.com/questions/1022/is-it-possible-to-display-stuff-below-the-prompt-at-a-prompt
-function eraseSecondLine () {
-    print -rn -- $terminfo[el];
-    #echo; # this would keep the second line
-}
-add-zsh-hook preexec eraseSecondLine
-
diff --git a/application/scripts/configuration/modules/bootstrap/files/zshrc b/application/scripts/configuration/modules/bootstrap/files/zshrc
deleted file mode 100644
index 1d223a718..000000000
--- a/application/scripts/configuration/modules/bootstrap/files/zshrc
+++ /dev/null
@@ -1,15 +0,0 @@
-# first include of the environment
-source $HOME/.config/zsh/environment.zsh
-
-typeset -ga sources
-sources+="$ZSH_CONFIG/options.zsh"
-sources+="$ZSH_CONFIG/prompt.zsh"
-sources+="$ZSH_CONFIG/aliases.zsh"
-
-# try to include all sources
-foreach file (`echo $sources`)
-    if [[ -a $file ]]; then
-        source $file
-    fi
-end
-
diff --git a/application/scripts/configuration/modules/bootstrap/manifests/init.pp b/application/scripts/configuration/modules/bootstrap/manifests/init.pp
deleted file mode 100644
index bf5fbe04b..000000000
--- a/application/scripts/configuration/modules/bootstrap/manifests/init.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-class bootstrap 
-{
-    # install some useful tools
-    # git 
-    package { ["htop", "vim", "unzip", "curl", "zsh", "raptor2-utils", "make"]:
-        ensure => latest
-    }
-
-    exec { "chsh-to-zsh":
-        command => "/usr/bin/chsh -s /usr/bin/zsh vagrant",
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.config/":
-        ensure => directory,
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.config/zsh/":
-        ensure => directory,
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.config/zsh/environment.zsh":
-        ensure => present,
-        source => "puppet:///modules/bootstrap/environment.zsh",
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.config/zsh/options.zsh":
-        ensure => present,
-        source => "puppet:///modules/bootstrap/options.zsh",
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.config/zsh/prompt.zsh":
-        ensure => present,
-        source => "puppet:///modules/bootstrap/prompt.zsh",
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.config/zsh/aliases.zsh":
-        ensure => present,
-        source => "puppet:///modules/bootstrap/aliases.zsh",
-        require => Package["zsh"]
-    }
-    
-    file { "/home/vagrant/.zshrc":
-        ensure => present,
-        source => "puppet:///modules/bootstrap/zshrc",
-        require => Package["zsh"]
-    }
-}
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/mysql/manifests/init.pp b/application/scripts/configuration/modules/mysql/manifests/init.pp
deleted file mode 100644
index f8e064707..000000000
--- a/application/scripts/configuration/modules/mysql/manifests/init.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class mysql {
-
-  $mysql_root_pw = $ubuntu::mysql_root_pw
-
-  # mysql
-  package { "mysql-server": ensure => installed }
-  package { "mysql-client": ensure => installed }
-
-  # mysql service
-  service { "mysql":
-    enable => true,
-    ensure => running,
-    require => Package["mysql-server"],
-  }
-
-  # set root password
-  exec { "set-mysql-password":
-    unless => "mysqladmin -uroot -p${mysql_root_pw} status",
-    path => ["/bin", "/usr/bin"],
-    command => "mysqladmin -uroot password ${mysql_root_pw}",
-    require => Service["mysql"],
-  }
-}
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/ontowiki/manifests/init.pp b/application/scripts/configuration/modules/ontowiki/manifests/init.pp
deleted file mode 100644
index b179333d5..000000000
--- a/application/scripts/configuration/modules/ontowiki/manifests/init.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-class ontowiki {
-
-  $mysql_root_pw = $ubuntu::mysql_root_pw
-  $mysql_user = $ubuntu::mysql_user
-  $mysql_pw = $ubuntu::mysql_pw
-  
-  exec { "create-mysql-ontowiki-db":
-        unless => "/usr/bin/mysql -uroot -p${mysql_root_pw} ontowiki",
-        command => "/usr/bin/mysql -uroot -p${mysql_root_pw} -e \"create database ontowiki;\"",
-        require => [Service["mysql"], Exec["set-mysql-password"]]
-  }
-  
-  exec { "create-mysql-ow-test-db":
-        unless => "/usr/bin/mysql -uroot -p${mysql_root_pw} ow_TEST",
-        command => "/usr/bin/mysql -uroot -p${mysql_root_pw} -e \"create database ow_TEST;\"",
-        require => [Service["mysql"], Exec["set-mysql-password"]]
-  }
-  
-  exec { "create-mysql-erfurt-test-db":
-        unless => "/usr/bin/mysql -uroot -p${mysql_root_pw} erfurt_TEST",
-        command => "/usr/bin/mysql -uroot -p${mysql_root_pw} -e \"create database erfurt_TEST;\"",
-        require => [Service["mysql"], Exec["set-mysql-password"]]
-  }
-
-  exec { "grant-mysql-ontowiki-db-to-php-user":
-        unless => "/usr/bin/mysql -u${$mysql_user} -p${mysql_pw} ontowiki",
-        command => "/usr/bin/mysql -uroot -p${mysql_root_pw} -e \"grant all on ontowiki.* to ${mysql_user}@'localhost' identified by '${mysql_pw}';\"",
-        require => [Service["mysql"], Exec["create-mysql-ontowiki-db"]]
-  }
-  
-  exec { "grant-mysql-ow-test-db-to-php-user":
-        unless => "/usr/bin/mysql -u${$mysql_user} -p${mysql_pw} ow_TEST",
-        command => "/usr/bin/mysql -uroot -p${mysql_root_pw} -e \"grant all on ow_TEST.* to ${mysql_user}@'localhost' identified by '${mysql_pw}';\"",
-        require => [Service["mysql"], Exec["create-mysql-ow-test-db"]]
-  }
-  
-  exec { "grant-mysql-erfurt-test-db-to-php-user":
-        unless => "/usr/bin/mysql -u${$mysql_user} -p${mysql_pw} erfurt_TEST",
-        command => "/usr/bin/mysql -uroot -p${mysql_root_pw} -e \"grant all on erfurt_TEST.* to ${mysql_user}@'localhost' identified by '${mysql_pw}';\"",
-        require => [Service["mysql"], Exec["create-mysql-erfurt-test-db"]]
-  }
-}
diff --git a/application/scripts/configuration/modules/php5/files/apc.ini b/application/scripts/configuration/modules/php5/files/apc.ini
deleted file mode 100644
index 8515e6f09..000000000
--- a/application/scripts/configuration/modules/php5/files/apc.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-extension = apc.so
-
-apc.enabled = 1
-apc.shm_size = 128M
-apc.shm_segments=1
-apc.write_lock = 1
-apc.optimization=0
-apc.rfc1867 = On
-apc.ttl=7200
-apc.user_ttl=7200
-apc.num_files_hint=1024
-;apc.mmap_file_mask=/tmp/apc.XXXXXX
-apc.enable_cli=1
-; Optional, for "[apc-warning] Potential cache slam averted for key... errors"
-; apc.slam_defense = Off
-
-; for production
-; apc.stat = 0
-;
diff --git a/application/scripts/configuration/modules/php5/files/custom_settings.ini b/application/scripts/configuration/modules/php5/files/custom_settings.ini
deleted file mode 100644
index b884a98b8..000000000
--- a/application/scripts/configuration/modules/php5/files/custom_settings.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-; adapt include_path for Zend and PEAR
-include_path = ".:/usr/local/zend/share/ZendFramework/current/library:/usr/share/php"
-
-short_open_tag = Off
-
-memory_limit = 512M
-
-display_errors = On
-html_errors = On
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/php5/files/xdebug.ini b/application/scripts/configuration/modules/php5/files/xdebug.ini
deleted file mode 100644
index 30ed032d7..000000000
--- a/application/scripts/configuration/modules/php5/files/xdebug.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-;zend_extension=xdebug.so
-;zend_extension=/usr/lib/php5/20090626/xdebug.so
-zend_extension=/usr/lib/php5/20090626/xdebug.so
-;xdebug.remote_enable=1
-;xdebug.remote_handler=dbgp
-;xdebug.remote_mode=req
-;xdebug.remote_port=9000
-;xdebug.remote_host=localhost
-;xdebug.idekey=default
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/php5/manifests/init.pp b/application/scripts/configuration/modules/php5/manifests/init.pp
deleted file mode 100644
index 7cd5b7d48..000000000
--- a/application/scripts/configuration/modules/php5/manifests/init.pp
+++ /dev/null
@@ -1,46 +0,0 @@
-class php5 {
-
-    # php related packages
-    package { ["php5", "libapache2-mod-php5", "php5-mysql", "php5-cli", "php5-common",  "php5-tidy", "php5-xdebug", "php5-xsl", "php5-xmlrpc", "php5-odbc", "php5-gd", "php-apc", "php5-memcache", "php5-memcached", "php5-suhosin"]:
-        ensure => installed
-    }
-    
-    # xdebug
-    file { "/etc/php5/conf.d/xdebug.ini":
-        ensure => present,
-        replace => true,
-        owner   => "root",
-        group   => "root",
-        mode    => "0644",
-        source => "puppet:///modules/php5/xdebug.ini",
-        require => Package["php5-xdebug"]
-    }
-    
-    file { "/etc/php5/conf.d/custom_settings.ini":
-        ensure => present,
-        replace => true,
-        owner   => "root",
-        group   => "root",
-        mode    => "0644",
-        source => "puppet:///modules/php5/custom_settings.ini",
-        require => Package["php5"]
-    }
-    
-    # apc
-    file { "/etc/php5/conf.d/apc.ini":
-        ensure => present,
-        replace => true,
-        owner   => "root",
-        group   => "root",
-        mode    => "0644",
-        source => "puppet:///modules/php5/apc.ini",
-        require => Package["php5"]
-    }
-    
-    # disable php-fpm since not used yet
-    #service { "php5-fpm":
-    #    ensure => stopped,
-    #    enable => false,
-    #    require => Package["php5"],
-    #}
-}
diff --git a/application/scripts/configuration/modules/phpqatools/manifests/init.pp b/application/scripts/configuration/modules/phpqatools/manifests/init.pp
deleted file mode 100644
index 52a4a4131..000000000
--- a/application/scripts/configuration/modules/phpqatools/manifests/init.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class phpqatools {
-
-  exec { "pear-install-phpqatools":
-    command => "/usr/bin/pear install pear.phpqatools.org/phpqatools",
-    creates => "/usr/bin/phpcb",
-    require => Exec["pear-install-phpunit"]
-  }
-}
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/phpunit/manifests/init.pp b/application/scripts/configuration/modules/phpunit/manifests/init.pp
deleted file mode 100644
index 1ce8d933b..000000000
--- a/application/scripts/configuration/modules/phpunit/manifests/init.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-class phpunit {
-
-  # package
-  package { "php-pear": 
-    ensure => installed,
-  }
-
-  exec { "upgrade-pear":
-    command => "/usr/bin/pear upgrade PEAR",
-    creates => "/usr/bin/phpunit",
-    require => Package["php-pear"],
-  }
-
-  exec { "pear-config-set-auto-discover":
-    command => "/usr/bin/pear config-set auto_discover 1",
-    creates => "/usr/bin/phpunit",
-    require => [Package["php-pear"], Exec["upgrade-pear"]]
-  }
-
-  exec { "pear-install-phpunit":
-    command => "/usr/bin/pear install pear.phpunit.de/PHPUnit",
-    creates => "/usr/bin/phpunit",
-    require => [Exec["upgrade-pear"], Exec["pear-config-set-auto-discover"]]
-  }
-}
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/virtuoso/files/odbc.ini b/application/scripts/configuration/modules/virtuoso/files/odbc.ini
deleted file mode 100644
index 05376d349..000000000
--- a/application/scripts/configuration/modules/virtuoso/files/odbc.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[ODBC Data Sources]
-VOS = Virtuoso
-VOS_TEST = Virtuoso Test
-
-[VOS]
-Driver = /usr/lib/odbc/virtodbc.so
-Address = localhost:1111
-
-[VOS_TEST]
-Driver = /usr/lib/odbc/virtodbc.so
-Address = localhost:1112
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/virtuoso/files/ontowiki-dev b/application/scripts/configuration/modules/virtuoso/files/ontowiki-dev
deleted file mode 100755
index c4630fc4f..000000000
--- a/application/scripts/configuration/modules/virtuoso/files/ontowiki-dev
+++ /dev/null
@@ -1,163 +0,0 @@
-#! /bin/sh
-#
-# virtuoso	OpenLink Virtuoso Open-Source Edition
-#
-#		Written by OpenLink Virtuoso Maintainer 
-#		<vos.admin@openlinksw.com>
-#
-# Version:	@(#)virtuoso  6.1.4  25-Mar-2011	vos.admin@openlinksw.com
-#
-
-### BEGIN INIT INFO
-# Provides:		virtuoso
-# Required-Start: 	$syslog
-# Required-Stop: 	$syslog
-# Default-Start:	2 3 4 5
-# Default-Stop: 	0 1 6
-# Short-Description:	Start Virtuoso database server on startup
-# Description:		Start and stop the primary instance of Virtuoso running
-# 	in /var/lib/virtuoso/db/. The first time this runs, it loads the
-# 	Conductor administrative package.
-### END INIT INFO
-
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/virtuoso-t
-NAME=virtuoso
-CONFIG=ontowiki-dev
-DESC="OpenLink Virtuoso OntoWiki Development Database"
-DBBASE=/var/lib/virtuoso/ontowiki-dev
-
-test -x $DAEMON || exit 0
-
-PIDFILE=$DBBASE/$NAME.lck
-DODTIME=1                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-# Include virtuoso-opensource defaults if available
-#if [ -f /etc/default/virtuoso-opensource ] ; then
-#	. /etc/default/virtuoso-opensource
-#fi
-
-set -e
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected child?
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    . $PIDFILE
-    pid="$VIRT_PID"
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $LABEL (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
-}
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	cd "$DBBASE" || exit -1
-	$DAEMON -c $CONFIG +wait
-        if running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	cd "$DBBASE" || exit -1
-	. ./virtuoso.lck
-	if running ; then
-	    kill $VIRT_PID
-	fi
-	echo "$NAME."
-	;;
-  force-stop)
-	echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON \
-	&& $0 restart \
-	|| exit 0
-	;;
-  status)
-    echo -n "$LABEL is "
-    if running ;  then
-        echo "running"
-    else
-        echo " not running."
-        exit 1
-    fi
-    ;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/virtuoso/files/ontowiki-dev.ini b/application/scripts/configuration/modules/virtuoso/files/ontowiki-dev.ini
deleted file mode 100644
index dbbbb9306..000000000
--- a/application/scripts/configuration/modules/virtuoso/files/ontowiki-dev.ini
+++ /dev/null
@@ -1,239 +0,0 @@
-;
-;  virtuoso.ini
-;
-;  Configuration file for the OpenLink Virtuoso VDBMS Server
-;
-;  To learn more about this product, or any other product in our
-;  portfolio, please check out our web site at:
-;
-;      http://virtuoso.openlinksw.com/
-;
-;  or contact us at:
-;
-;      general.information@openlinksw.com
-;
-;  If you have any technical questions, please contact our support
-;  staff at:
-;
-;      technical.support@openlinksw.com
-;
-;
-;  Database setup
-;
-[Database]
-DatabaseFile       = /var/lib/virtuoso/ontowiki-dev/virtuoso.db
-ErrorLogFile       = /vagrant/logs/virtuoso-ontowiki-dev.log
-LockFile           = /var/lib/virtuoso/ontowiki-dev/virtuoso.lck
-TransactionFile    = /var/lib/virtuoso/ontowiki-dev/virtuoso.trx
-xa_persistent_file = /var/lib/virtuoso/ontowiki-dev/virtuoso.pxa
-ErrorLogLevel      = 7
-FileExtend         = 200
-MaxCheckpointRemap = 2000
-Striping           = 0
-TempStorage        = TempDatabase
-
-[TempDatabase]
-DatabaseFile       = /var/lib/virtuoso/ontowiki-dev/virtuoso-temp.db
-TransactionFile    = /var/lib/virtuoso/ontowiki-dev/virtuoso-temp.trx
-MaxCheckpointRemap = 2000
-Striping           = 0
-
-;
-;  Server parameters
-;
-[Parameters]
-ServerPort               = 1111
-LiteMode                 = 0
-DisableUnixSocket        = 1
-DisableTcpSocket         = 0
-;SSLServerPort			= 2111
-;SSLCertificate			= cert.pem
-;SSLPrivateKey			= pk.pem
-;X509ClientVerify		= 0
-;X509ClientVerifyDepth		= 0
-;X509ClientVerifyCAFile		= ca.pem
-ServerThreads            = 5
-CheckpointInterval       = 60
-O_DIRECT                 = 0
-CaseMode                 = 2
-MaxStaticCursorRows      = 5000
-CheckpointAuditTrail     = 0
-AllowOSCalls             = 0
-SchedulerInterval        = 10
-DirsAllowed              = ., /usr/share/virtuoso-opensource-6.1/vad, /vagrant
-ThreadCleanupInterval    = 0
-ThreadThreshold          = 10
-ResourcesCleanupInterval = 0
-FreeTextBatchSize        = 100000
-SingleCPU                = 0
-VADInstallDir            = /usr/share/virtuoso-opensource-6.1/vad/
-PrefixResultNames        = 0
-RdfFreeTextRulesSize     = 100
-IndexTreeMaps            = 256
-MaxMemPoolSize           = 200000000
-PrefixResultNames        = 0
-MacSpotlight             = 0
-IndexTreeMaps            = 64
-;;
-;; When running with large data sets, one should configure the Virtuoso
-;; process to use between 2/3 to 3/5 of free system memory and to stripe
-;; storage on all available disks.
-;;
-;; Uncomment next two lines if there is 2 GB system memory free
-;       NumberOfBuffers          = 170000
-;       MaxDirtyBuffers          = 130000
-;; Uncomment next two lines if there is 4 GB system memory free
-;       NumberOfBuffers          = 340000
-;       MaxDirtyBuffers          = 250000
-;; Uncomment next two lines if there is 8 GB system memory free
-;       NumberOfBuffers          = 680000
-;       MaxDirtyBuffers          = 500000
-;; Uncomment next two lines if there is 16 GB system memory free
-;       NumberOfBuffers          = 1360000
-;       MaxDirtyBuffers          = 1000000
-;; Uncomment next two lines if there is 32 GB system memory free
-;       NumberOfBuffers          = 2720000
-;       MaxDirtyBuffers          = 2000000
-;; Uncomment next two lines if there is 48 GB system memory free
-;       NumberOfBuffers          = 4000000
-;       MaxDirtyBuffers          = 3000000
-;; Uncomment next two lines if there is 64 GB system memory free
-;       NumberOfBuffers          = 5450000
-;       MaxDirtyBuffers          = 4000000
-;;
-;; Note the default settings will take very little memory
-;; but will not result in very good performance
-;;
-NumberOfBuffers          = 10000
-MaxDirtyBuffers          = 6000
-
-[HTTPServer]
-ServerPort                  = 8890
-ServerRoot                  = /var/lib/virtuoso-opensource-6.1/vsp
-ServerThreads               = 2
-DavRoot                     = DAV
-EnabledDavVSP               = 0
-HTTPProxyEnabled            = 0
-TempASPXDir                 = 0
-DefaultMailServer           = localhost:25
-ServerThreads               = 10
-MaxKeepAlives               = 10
-KeepAliveTimeout            = 10
-MaxCachedProxyConnections   = 10
-ProxyConnectionCacheTimeout = 15
-HTTPThreadSize              = 280000
-HttpPrintWarningsInOutput   = 0
-Charset                     = UTF-8
-;HTTPLogFile		        = logs/http.log
-
-[AutoRepair]
-BadParentLinks = 0
-
-[Client]
-SQL_PREFETCH_ROWS  = 100
-SQL_PREFETCH_BYTES = 16000
-SQL_QUERY_TIMEOUT  = 0
-SQL_TXN_TIMEOUT    = 0
-;SQL_NO_CHAR_C_ESCAPE		= 1
-;SQL_UTF8_EXECS			= 0
-;SQL_NO_SYSTEM_TABLES		= 0
-;SQL_BINARY_TIMESTAMP		= 1
-;SQL_ENCRYPTION_ON_PASSWORD	= -1
-
-[VDB]
-ArrayOptimization           = 0
-NumArrayParameters          = 10
-VDBDisconnectTimeout        = 1000
-KeepConnectionOnFixedThread = 0
-
-[Replication]
-ServerName   = db
-ServerEnable = 1
-QueueMax     = 50000
-
-;
-;  Striping setup
-;
-;  These parameters have only effect when Striping is set to 1 in the
-;  [Database] section, in which case the DatabaseFile parameter is ignored.
-;
-;  With striping, the database is spawned across multiple segments
-;  where each segment can have multiple stripes.
-;
-;  Format of the lines below:
-;    Segment<number> = <size>, <stripe file name> [, <stripe file name> .. ]
-;
-;  <number> must be ordered from 1 up.
-;
-;  The <size> is the total size of the segment which is equally divided
-;  across all stripes forming  the segment. Its specification can be in
-;  gigabytes (g), megabytes (m), kilobytes (k) or in database blocks
-;  (b, the default)
-;
-;  Note that the segment size must be a multiple of the database page size
-;  which is currently 8k. Also, the segment size must be divisible by the
-;  number of stripe files forming  the segment.
-;
-;  The example below creates a 200 meg database striped on two segments
-;  with two stripes of 50 meg and one of 100 meg.
-;
-;  You can always add more segments to the configuration, but once
-;  added, do not change the setup.
-;
-[Striping]
-Segment1 = 100M, db-seg1-1.db, db-seg1-2.db
-Segment2 = 100M, db-seg2-1.db
-;...
-;[TempStriping]
-;Segment1			= 100M, db-seg1-1.db, db-seg1-2.db
-;Segment2			= 100M, db-seg2-1.db
-;...
-;[Ucms]
-;UcmPath			= <path>
-;Ucm1				= <file>
-;Ucm2				= <file>
-;...
-
-[Zero Config]
-ServerName = virtuoso
-;ServerDSN			= ZDSN
-;SSLServerName			=
-;SSLServerDSN			=
-
-[Mono]
-;MONO_TRACE			= Off
-;MONO_PATH			= <path_here>
-;MONO_ROOT			= <path_here>
-;MONO_CFG_DIR			= <path_here>
-;virtclr.dll			=
-
-[URIQA]
-DynamicLocal = 0
-DefaultHost  = localhost:8890
-
-[SPARQL]
-;ExternalQuerySource		= 1
-;ExternalXsltSource 		= 1
-;DefaultGraph      		= http://localhost:8890/dataspace
-;ImmutableGraphs    		= http://localhost:8890/dataspace
-ResultSetMaxRows           = 10000
-MaxQueryCostEstimationTime = 400	; in seconds
-MaxQueryExecutionTime      = 60	; in seconds
-DefaultQuery               = select distinct ?Concept where {[] a ?Concept} LIMIT 100
-DeferInferenceRulesInit    = 0	; controls inference rules loading
-;PingService       		= http://rpc.pingthesemanticweb.com/
-
-[Plugins]
-LoadPath = /usr/lib/virtuoso-opensource-6.1/hosting
-;Load1    = plain, wikiv
-;Load2    = plain, mediawiki
-;Load3    = plain, creolewiki
-;Load4    = plain, im
-;Load5		= plain, wbxml2
-;Load6			= plain, hslookup
-;Load7			= attach, libphp5.so
-;Load8			= Hosting, hosting_php.so
-;Load9			= Hosting,hosting_perl.so
-;Load10		= Hosting,hosting_python.so
-;Load11		= Hosting,hosting_ruby.so
-;Load12				= msdtc,msdtc_sample
diff --git a/application/scripts/configuration/modules/virtuoso/files/ontowiki-test b/application/scripts/configuration/modules/virtuoso/files/ontowiki-test
deleted file mode 100755
index 241f7327c..000000000
--- a/application/scripts/configuration/modules/virtuoso/files/ontowiki-test
+++ /dev/null
@@ -1,163 +0,0 @@
-#! /bin/sh
-#
-# virtuoso	OpenLink Virtuoso Open-Source Edition
-#
-#		Written by OpenLink Virtuoso Maintainer 
-#		<vos.admin@openlinksw.com>
-#
-# Version:	@(#)virtuoso  6.1.4  25-Mar-2011	vos.admin@openlinksw.com
-#
-
-### BEGIN INIT INFO
-# Provides:		virtuoso
-# Required-Start: 	$syslog
-# Required-Stop: 	$syslog
-# Default-Start:	2 3 4 5
-# Default-Stop: 	0 1 6
-# Short-Description:	Start Virtuoso database server on startup
-# Description:		Start and stop the primary instance of Virtuoso running
-# 	in /var/lib/virtuoso/db/. The first time this runs, it loads the
-# 	Conductor administrative package.
-### END INIT INFO
-
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/virtuoso-t
-NAME=virtuoso
-CONFIG=ontowiki-test
-DESC="OpenLink Virtuoso OntoWiki Test Database"
-DBBASE=/var/lib/virtuoso/ontowiki-test
-
-test -x $DAEMON || exit 0
-
-PIDFILE=$DBBASE/$NAME.lck
-DODTIME=1                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-# Include virtuoso-opensource defaults if available
-#if [ -f /etc/default/virtuoso-opensource ] ; then
-#	. /etc/default/virtuoso-opensource
-#fi
-
-set -e
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected child?
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    . $PIDFILE
-    pid="$VIRT_PID"
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $LABEL (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
-}
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	cd "$DBBASE" || exit -1
-	$DAEMON -c $CONFIG +wait
-        if running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	cd "$DBBASE" || exit -1
-	. ./virtuoso.lck
-	if running ; then
-	    kill $VIRT_PID
-	fi
-	echo "$NAME."
-	;;
-  force-stop)
-	echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON \
-	&& $0 restart \
-	|| exit 0
-	;;
-  status)
-    echo -n "$LABEL is "
-    if running ;  then
-        echo "running"
-    else
-        echo " not running."
-        exit 1
-    fi
-    ;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/virtuoso/files/ontowiki-test.ini b/application/scripts/configuration/modules/virtuoso/files/ontowiki-test.ini
deleted file mode 100644
index 1fe708c20..000000000
--- a/application/scripts/configuration/modules/virtuoso/files/ontowiki-test.ini
+++ /dev/null
@@ -1,239 +0,0 @@
-;
-;  virtuoso.ini
-;
-;  Configuration file for the OpenLink Virtuoso VDBMS Server
-;
-;  To learn more about this product, or any other product in our
-;  portfolio, please check out our web site at:
-;
-;      http://virtuoso.openlinksw.com/
-;
-;  or contact us at:
-;
-;      general.information@openlinksw.com
-;
-;  If you have any technical questions, please contact our support
-;  staff at:
-;
-;      technical.support@openlinksw.com
-;
-;
-;  Database setup
-;
-[Database]
-DatabaseFile       = /var/lib/virtuoso/ontowiki-test/virtuoso.db
-ErrorLogFile       = /vagrant/logs/virtuoso-ontowiki-test.log
-LockFile           = /var/lib/virtuoso/ontowiki-test/virtuoso.lck
-TransactionFile    = /var/lib/virtuoso/ontowiki-test/virtuoso.trx
-xa_persistent_file = /var/lib/virtuoso/ontowiki-test/virtuoso.pxa
-ErrorLogLevel      = 7
-FileExtend         = 200
-MaxCheckpointRemap = 2000
-Striping           = 0
-TempStorage        = TempDatabase
-
-[TempDatabase]
-DatabaseFile       = /var/lib/virtuoso/ontowiki-test/virtuoso-temp.db
-TransactionFile    = /var/lib/virtuoso/ontowiki-test/virtuoso-temp.trx
-MaxCheckpointRemap = 2000
-Striping           = 0
-
-;
-;  Server parameters
-;
-[Parameters]
-ServerPort               = 1112
-LiteMode                 = 0
-DisableUnixSocket        = 1
-DisableTcpSocket         = 0
-;SSLServerPort			= 2111
-;SSLCertificate			= cert.pem
-;SSLPrivateKey			= pk.pem
-;X509ClientVerify		= 0
-;X509ClientVerifyDepth		= 0
-;X509ClientVerifyCAFile		= ca.pem
-ServerThreads            = 5
-CheckpointInterval       = 60
-O_DIRECT                 = 0
-CaseMode                 = 2
-MaxStaticCursorRows      = 5000
-CheckpointAuditTrail     = 0
-AllowOSCalls             = 0
-SchedulerInterval        = 10
-DirsAllowed              = ., /usr/share/virtuoso-opensource-6.1/vad, /vagrant
-ThreadCleanupInterval    = 0
-ThreadThreshold          = 10
-ResourcesCleanupInterval = 0
-FreeTextBatchSize        = 100000
-SingleCPU                = 0
-VADInstallDir            = /usr/share/virtuoso-opensource-6.1/vad/
-PrefixResultNames        = 0
-RdfFreeTextRulesSize     = 100
-IndexTreeMaps            = 256
-MaxMemPoolSize           = 200000000
-PrefixResultNames        = 0
-MacSpotlight             = 0
-IndexTreeMaps            = 64
-;;
-;; When running with large data sets, one should configure the Virtuoso
-;; process to use between 2/3 to 3/5 of free system memory and to stripe
-;; storage on all available disks.
-;;
-;; Uncomment next two lines if there is 2 GB system memory free
-;       NumberOfBuffers          = 170000
-;       MaxDirtyBuffers          = 130000
-;; Uncomment next two lines if there is 4 GB system memory free
-;       NumberOfBuffers          = 340000
-;       MaxDirtyBuffers          = 250000
-;; Uncomment next two lines if there is 8 GB system memory free
-;       NumberOfBuffers          = 680000
-;       MaxDirtyBuffers          = 500000
-;; Uncomment next two lines if there is 16 GB system memory free
-;       NumberOfBuffers          = 1360000
-;       MaxDirtyBuffers          = 1000000
-;; Uncomment next two lines if there is 32 GB system memory free
-;       NumberOfBuffers          = 2720000
-;       MaxDirtyBuffers          = 2000000
-;; Uncomment next two lines if there is 48 GB system memory free
-;       NumberOfBuffers          = 4000000
-;       MaxDirtyBuffers          = 3000000
-;; Uncomment next two lines if there is 64 GB system memory free
-;       NumberOfBuffers          = 5450000
-;       MaxDirtyBuffers          = 4000000
-;;
-;; Note the default settings will take very little memory
-;; but will not result in very good performance
-;;
-NumberOfBuffers          = 10000
-MaxDirtyBuffers          = 6000
-
-[HTTPServer]
-ServerPort                  = 8891
-ServerRoot                  = /var/lib/virtuoso-opensource-6.1/vsp
-ServerThreads               = 2
-DavRoot                     = DAV
-EnabledDavVSP               = 0
-HTTPProxyEnabled            = 0
-TempASPXDir                 = 0
-DefaultMailServer           = localhost:25
-ServerThreads               = 10
-MaxKeepAlives               = 10
-KeepAliveTimeout            = 10
-MaxCachedProxyConnections   = 10
-ProxyConnectionCacheTimeout = 15
-HTTPThreadSize              = 280000
-HttpPrintWarningsInOutput   = 0
-Charset                     = UTF-8
-;HTTPLogFile		        = logs/http.log
-
-[AutoRepair]
-BadParentLinks = 0
-
-[Client]
-SQL_PREFETCH_ROWS  = 100
-SQL_PREFETCH_BYTES = 16000
-SQL_QUERY_TIMEOUT  = 0
-SQL_TXN_TIMEOUT    = 0
-;SQL_NO_CHAR_C_ESCAPE		= 1
-;SQL_UTF8_EXECS			= 0
-;SQL_NO_SYSTEM_TABLES		= 0
-;SQL_BINARY_TIMESTAMP		= 1
-;SQL_ENCRYPTION_ON_PASSWORD	= -1
-
-[VDB]
-ArrayOptimization           = 0
-NumArrayParameters          = 10
-VDBDisconnectTimeout        = 1000
-KeepConnectionOnFixedThread = 0
-
-[Replication]
-ServerName   = db
-ServerEnable = 1
-QueueMax     = 50000
-
-;
-;  Striping setup
-;
-;  These parameters have only effect when Striping is set to 1 in the
-;  [Database] section, in which case the DatabaseFile parameter is ignored.
-;
-;  With striping, the database is spawned across multiple segments
-;  where each segment can have multiple stripes.
-;
-;  Format of the lines below:
-;    Segment<number> = <size>, <stripe file name> [, <stripe file name> .. ]
-;
-;  <number> must be ordered from 1 up.
-;
-;  The <size> is the total size of the segment which is equally divided
-;  across all stripes forming  the segment. Its specification can be in
-;  gigabytes (g), megabytes (m), kilobytes (k) or in database blocks
-;  (b, the default)
-;
-;  Note that the segment size must be a multiple of the database page size
-;  which is currently 8k. Also, the segment size must be divisible by the
-;  number of stripe files forming  the segment.
-;
-;  The example below creates a 200 meg database striped on two segments
-;  with two stripes of 50 meg and one of 100 meg.
-;
-;  You can always add more segments to the configuration, but once
-;  added, do not change the setup.
-;
-[Striping]
-Segment1 = 100M, db-seg1-1.db, db-seg1-2.db
-Segment2 = 100M, db-seg2-1.db
-;...
-;[TempStriping]
-;Segment1			= 100M, db-seg1-1.db, db-seg1-2.db
-;Segment2			= 100M, db-seg2-1.db
-;...
-;[Ucms]
-;UcmPath			= <path>
-;Ucm1				= <file>
-;Ucm2				= <file>
-;...
-
-[Zero Config]
-ServerName = virtuoso
-;ServerDSN			= ZDSN
-;SSLServerName			=
-;SSLServerDSN			=
-
-[Mono]
-;MONO_TRACE			= Off
-;MONO_PATH			= <path_here>
-;MONO_ROOT			= <path_here>
-;MONO_CFG_DIR			= <path_here>
-;virtclr.dll			=
-
-[URIQA]
-DynamicLocal = 0
-DefaultHost  = localhost:8890
-
-[SPARQL]
-;ExternalQuerySource		= 1
-;ExternalXsltSource 		= 1
-;DefaultGraph      		= http://localhost:8890/dataspace
-;ImmutableGraphs    		= http://localhost:8890/dataspace
-ResultSetMaxRows           = 10000
-MaxQueryCostEstimationTime = 400	; in seconds
-MaxQueryExecutionTime      = 60	; in seconds
-DefaultQuery               = select distinct ?Concept where {[] a ?Concept} LIMIT 100
-DeferInferenceRulesInit    = 0	; controls inference rules loading
-;PingService       		= http://rpc.pingthesemanticweb.com/
-
-[Plugins]
-LoadPath = /usr/lib/virtuoso-opensource-6.1/hosting
-;Load1    = plain, wikiv
-;Load2    = plain, mediawiki
-;Load3    = plain, creolewiki
-;Load4    = plain, im
-;Load5		= plain, wbxml2
-;Load6			= plain, hslookup
-;Load7			= attach, libphp5.so
-;Load8			= Hosting, hosting_php.so
-;Load9			= Hosting,hosting_perl.so
-;Load10		= Hosting,hosting_python.so
-;Load11		= Hosting,hosting_ruby.so
-;Load12				= msdtc,msdtc_sample
diff --git a/application/scripts/configuration/modules/virtuoso/manifests/init.pp b/application/scripts/configuration/modules/virtuoso/manifests/init.pp
deleted file mode 100644
index 78f575c9b..000000000
--- a/application/scripts/configuration/modules/virtuoso/manifests/init.pp
+++ /dev/null
@@ -1,72 +0,0 @@
-class virtuoso {
-
-  # virtuoso
-  package { "virtuoso-opensource": ensure => installed }
-
-  # copy ODBC config files
-  file { "/etc/odbc.ini":
-    ensure => present,
-    replace => true,
-    owner   => "root",
-    group   => "root",
-    mode    => "0755",
-    source => "puppet:///modules/virtuoso/odbc.ini",
-    require => Package["virtuoso-opensource"]
-  }
-
-  # copy init.d scripts
-  file { "/etc/init.d/ontowiki-dev":
-    ensure => present,
-    replace => true,
-    owner   => "root",
-    group   => "root",
-    mode    => "0755",
-    source => "puppet:///modules/virtuoso/ontowiki-dev",
-    require => Package["virtuoso-opensource"]
-  }
-  file { "/etc/init.d/ontowiki-test":
-    ensure => present,
-    replace => true,
-    owner   => "root",
-    group   => "root",
-    mode    => "0755",
-    source => "puppet:///modules/virtuoso/ontowiki-test",
-    require => Package["virtuoso-opensource"]
-  }
-  
-  # copy database ini files
-  file { ["/var/lib/virtuoso", "/var/lib/virtuoso/ontowiki-dev", "/var/lib/virtuoso/ontowiki-test"]:
-    ensure => "directory"
-  }
-  file { "/var/lib/virtuoso/ontowiki-dev/ontowiki-dev.ini":
-    ensure => present,
-    replace => true,
-    owner   => "root",
-    group   => "root",
-    mode    => "0644",
-    source => "puppet:///modules/virtuoso/ontowiki-dev.ini",
-    require => [Package["virtuoso-opensource"], File["/var/lib/virtuoso/ontowiki-dev"]]
-  }
-  file { "/var/lib/virtuoso/ontowiki-test/ontowiki-test.ini":
-    ensure => present,
-    replace => true,
-    owner   => "root",
-    group   => "root",
-    mode    => "0644",
-    source => "puppet:///modules/virtuoso/ontowiki-test.ini",
-    require => [Package["virtuoso-opensource"], File["/var/lib/virtuoso/ontowiki-test"]]
-  }
-
-  service { "ontowiki-dev":
-    enable => true,
-    ensure => running,
-    hasrestart => true,
-    require => [Package["virtuoso-opensource"], File["/etc/init.d/ontowiki-dev"], File["/var/lib/virtuoso/ontowiki-dev/ontowiki-dev.ini"]],
-  }
-  service { "ontowiki-test":
-    enable => true,
-    ensure => running,
-    hasrestart => true,
-    require => [Package["virtuoso-opensource"], File["/etc/init.d/ontowiki-test"], File["/var/lib/virtuoso/ontowiki-test/ontowiki-test.ini"]],
-  }
-}
\ No newline at end of file
diff --git a/application/scripts/configuration/modules/zend/manifests/init.pp b/application/scripts/configuration/modules/zend/manifests/init.pp
deleted file mode 100644
index c959efad2..000000000
--- a/application/scripts/configuration/modules/zend/manifests/init.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-class zend {
-    $version = $ubuntu::zend_version
-    $current = '/usr/local/zend/share/ZendFramework/current'
-    $zend_path = '/usr/local/zend/share/ZendFramework'
-
-    file {['/usr/local/zend', '/usr/local/zend/share', '/usr/local/zend/share/ZendFramework']:
-      ensure => "directory"
-    }
-    
-    exec { "download-zend":
-        unless => "ls $zend_path/ZendFramework-$version.zip",
-        path => ["/bin", "/usr/bin"],
-        cwd => $zend_path,
-        command => "/usr/bin/wget https://packages.zendframework.com/releases/ZendFramework-$version/ZendFramework-$version-minimal.zip",
-        creates => "$zend_path/ZendFramework-$version-minimal.zip",
-        require => [File[$zend_path]]
-    }
-
-    exec { "unzip-zend":
-        cwd => $zend_path,
-        creates => "$zend_path/ZendFramework-$version-minimal",
-        command => "/usr/bin/unzip -u ZendFramework-$version-minimal.zip",
-        require => [Exec["download-zend"]]
-    }
-
-    exec { "symlink-zend":
-        cwd => $zend_path,
-        command => "/bin/ln -sfn $zend_path/ZendFramework-$version-minimal $current",
-        require => [Exec["unzip-zend"]]
-    }
-}
diff --git a/application/shell.worker.client.php b/application/shell.worker.client.php
index 963a5edbd..6aadc9782 100755
--- a/application/shell.worker.client.php
+++ b/application/shell.worker.client.php
@@ -3,8 +3,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
@@ -18,7 +18,7 @@
  * error handling for the very first includes etc.
  * http://stackoverflow.com/questions/1241728/
  */
-function errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext)
+function errorHandler($errno, $errstr, $errfile, $errline, array $errcontext)
 {
     // error was suppressed with the @-operator
     if (0 === error_reporting()) {
@@ -32,7 +32,7 @@ function errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext)
  * in some configurations Apache prefixes the environment variables on each rewrite walkthrough
  * e.g. under centos
  */
-function getEnvVar ($key)
+function getEnvVar($key)
 {
     $prefix = "REDIRECT_";
     if (isset($_SERVER[$key])) {
@@ -119,7 +119,7 @@ function initApp()
         header('HTTP/1.1 500 Internal Server Error');
         echo 'Fatal Error: Could not load Zend library.<br />' . PHP_EOL
              . 'Maybe you need to install it with apt-get or with "make zend"?' . PHP_EOL;
-        exit;
+        return false;
     }
 
     // create application
@@ -135,7 +135,7 @@ function initApp()
     } catch (Exception $e) {
         echo 'Fatal Error: Could not load the OntoWiki Application Framework classes.' . PHP_EOL;
         echo 'Your installation directory seems to be screwed.' . PHP_EOL;
-        exit;
+        return false;
     }
 
     /* check/include Erfurt_App */
@@ -145,7 +145,7 @@ function initApp()
     } catch (Exception $e) {
         echo 'Fatal Error: Could not load the Erfurt Framework classes.' . PHP_EOL;
         echo 'Maybe you should install it with apt-get or with "make deploy"?' . PHP_EOL;
-        exit;
+        return false;
     }
 
     // restore old error handler
@@ -156,12 +156,16 @@ function initApp()
         $application->bootstrap();
     } catch (Exception $e) {
         echo 'Error on bootstrapping application: ' . $e->getMessage() . PHP_EOL;
-        exit;
+        return false;
     }
     return $application;
 }
 
 $application = initApp();
+if ($application === false) {
+    return 1;
+}
+
 $ontowiki    = OntoWiki::getInstance();
 echo $ontowiki->config->version->label . ' ' . $ontowiki->config->version->number . PHP_EOL;
 
@@ -186,4 +190,3 @@ function initApp()
 /*  -- END OF EXAMPLE --------------------------------------------------  */
 
 echo "done in " . round((microtime(true) - $timeStart) * 1000, 2) . "ms" . PHP_EOL;
-
diff --git a/application/shell.worker.php b/application/shell.worker.php
index fae9e533b..a443f4c4d 100755
--- a/application/shell.worker.php
+++ b/application/shell.worker.php
@@ -3,8 +3,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
@@ -18,7 +18,7 @@
  * error handling for the very first includes etc.
  * http://stackoverflow.com/questions/1241728/
  */
-function errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext)
+function errorHandler($errno, $errstr, $errfile, $errline, array $errcontext)
 {
     // error was suppressed with the @-operator
     if (0 === error_reporting()) {
@@ -32,7 +32,7 @@ function errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext)
  * in some configurations Apache prefixes the environment variables on each rewrite walkthrough
  * e.g. under centos
  */
-function getEnvVar ($key)
+function getEnvVar($key)
 {
     $prefix = "REDIRECT_";
     if (isset($_SERVER[$key])) {
@@ -48,7 +48,8 @@ function getEnvVar ($key)
     return null;
 }
 
-function initApp(){
+function initApp()
+{
     /* Profiling */
     define('REQUEST_START', microtime(true));
 
@@ -113,7 +114,7 @@ function initApp(){
         header('HTTP/1.1 500 Internal Server Error');
         echo 'Fatal Error: Could not load Zend library.<br />' . PHP_EOL
              . 'Maybe you need to install it with apt-get or with "make zend"?' . PHP_EOL;
-        exit;
+        return false;
     }
 
     // create application
@@ -127,9 +128,9 @@ function initApp(){
         // use include, so we can catch it with the error handler
         require_once 'OntoWiki.php';
     } catch (Exception $e) {
-        print('Fatal Error: Could not load the OntoWiki Application Framework classes.' . PHP_EOL);
-        print('Your installation directory seems to be screwed.' . PHP_EOL);
-        exit;
+        echo 'Fatal Error: Could not load the OntoWiki Application Framework classes.' . PHP_EOL;
+        echo 'Your installation directory seems to be screwed.' . PHP_EOL;
+        return false;
     }
 
     /* check/include Erfurt_App */
@@ -137,9 +138,9 @@ function initApp(){
         // use include, so we can catch it with the error handler
         require_once 'Erfurt/App.php';
     } catch (Exception $e) {
-        print('Fatal Error: Could not load the Erfurt Framework classes.' . PHP_EOL);
-        print('Maybe you should install it with apt-get or with "make deploy"?' . PHP_EOL);
-        exit;
+        echo 'Fatal Error: Could not load the Erfurt Framework classes.' . PHP_EOL;
+        echo 'Maybe you should install it with apt-get or with "make deploy"?' . PHP_EOL;
+        return false;
     }
 
     // restore old error handler
@@ -149,20 +150,23 @@ function initApp(){
     try {
         $application->bootstrap();
     } catch (Exception $e) {
-        print('Error on bootstrapping application: ' . $e->getMessage() . PHP_EOL);
-        exit;
+        echo 'Error on bootstrapping application: ' . $e->getMessage() . PHP_EOL;
+        return false;
     }
     return $application;
 }
 
 $application    = initApp();
+if ($application === false) {
+    return 1;
+}
 
 $bootstrap      = $application->getBootstrap();
 $ontoWiki       = OntoWiki::getInstance();
 $extManager     = $ontoWiki->extensionManager;
 $extensions     = $extManager->getExtensions();
 
-print($ontoWiki->config->version->label . ' ' . $ontoWiki->config->version->number . PHP_EOL);
+echo $ontoWiki->config->version->label . ' ' . $ontoWiki->config->version->number . PHP_EOL;
 
 // create a worker registry
 $workerRegistry = Erfurt_Worker_Registry::getInstance();
@@ -173,8 +177,8 @@ function initApp(){
 $event->registry    = $workerRegistry;
 $event->trigger();
 if (!count($workerRegistry->getJobs())) {
-    print('No jobs registered - nothing to do or wait for.' . PHP_EOL );
-    exit;
+    echo 'No jobs registered - nothing to do or wait for.' . PHP_EOL;
+    return;
 }
 
 // register  jobs manually
@@ -201,4 +205,3 @@ function initApp(){
 $worker = new Erfurt_Worker_Backend($workerRegistry);
 //  set worker and Gearman worker to listen mode and wait
 $worker->listen();
-
diff --git a/application/tests/Bootstrap.php b/application/tests/Bootstrap.php
index 8c62167f8..bf5f4619d 100644
--- a/application/tests/Bootstrap.php
+++ b/application/tests/Bootstrap.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -42,29 +42,11 @@
 // path to OntoWiki
 define('_OWROOT', ONTOWIKI_ROOT);
 
-// add libraries to include path
-$includePath = get_include_path() . PATH_SEPARATOR;
-$includePath .= _TESTROOT . PATH_SEPARATOR;
-$includePath .= ONTOWIKI_ROOT . 'application/classes/' . PATH_SEPARATOR;
-$includePath .= ONTOWIKI_ROOT . 'libraries/' . PATH_SEPARATOR;
-
-$includePath .= ONTOWIKI_ROOT . 'libraries/Erfurt/library' . PATH_SEPARATOR;
-$includePath .= ONTOWIKI_ROOT . 'libraries/Erfurt/tests/unit' . PATH_SEPARATOR; // for test base class
-set_include_path($includePath);
+require_once ONTOWIKI_ROOT . '/vendor/autoload.php';
 
 // start dummy session before any PHPUnit output
-require_once 'Zend/Session/Namespace.php';
 $session = new Zend_Session_Namespace('OntoWiki_Test');
 
-// Zend_Loader for class autoloading
-require_once 'Zend/Loader/Autoloader.php';
-$loader = Zend_Loader_Autoloader::getInstance();
-$loader->registerNamespace('OntoWiki_');
-$loader->registerNamespace('Erfurt_');
-//$loader->registerNamespace('PHPUnit_');
 
 // Access Erfurt app for constant loading etc.
 Erfurt_App::getInstance(false);
-
-/** OntoWiki */
-require_once 'OntoWiki.php';
diff --git a/application/tests/BootstrapExtensions.php b/application/tests/BootstrapExtensions.php
new file mode 100644
index 000000000..c0525cc2e
--- /dev/null
+++ b/application/tests/BootstrapExtensions.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * This file is part of the {@link http://ontowiki.net OntoWiki} project.
+ *
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
+/*
+ * Set error reporting to the level to which Erfurt code must comply.
+ */
+error_reporting(E_ALL | E_STRICT);
+
+/*
+ * Default timezone in order to prevent warnings
+ */
+date_default_timezone_set('Europe/Berlin');
+
+define('BOOTSTRAP_FILE', basename(__FILE__));
+define('ONTOWIKI_ROOT', realpath(dirname(__FILE__) . '/../..') . '/');
+define('APPLICATION_PATH', ONTOWIKI_ROOT . 'application/');
+define('APPLICATION_ENV', 'unittesting');
+define('ONTOWIKI_REWRITE', false);
+define('CACHE_PATH', ONTOWIKI_ROOT . 'cache' . DIRECTORY_SEPARATOR);
+
+// path to tests
+if (!defined('_TESTROOT')) {
+    define('_TESTROOT', rtrim(dirname(__FILE__), '/') . '/');
+}
+
+// path to OntoWiki
+define('_OWROOT', ONTOWIKI_ROOT);
+
+require_once ONTOWIKI_ROOT . '/vendor/autoload.php';
+
+// start dummy session before any PHPUnit output
+$session = new Zend_Session_Namespace('OntoWiki_Test');
+
+// Access Erfurt app for constant loading etc.
+Erfurt_App::getInstance(false);
diff --git a/application/tests/CodeSniffer/Makefile b/application/tests/CodeSniffer/Makefile
deleted file mode 100644
index 55e80f499..000000000
--- a/application/tests/CodeSniffer/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-default: help
-
-help:
-	@echo "     cs-enable ............................. Enable CodeSniffer to check code before every commit"
-	@echo "     cs-disable ............................ Disable CodeSniffer code checking"
-	@echo "     cs-check-commit ....................... Run pre-commit code checking manually"
-	@echo "     cs-check-commit-emacs ................. Same as cs-check-commit with emacs output)"
-	@echo "     cs-check-commit-intensive ............. Run pre-commit code checking"
-	@echo "                                             manually with stricter coding standard"
-	@echo "     cs-check .............................. Run complete code checking"
-	@echo "     cs-check-full ......................... Run complete code checking with detailed output"
-	@echo "     cs-check-emacs ........................ Run complete code checking with with emacs output"
-	@echo "     cs-check-blame ........................ Run complete code checking with blame list output"
-	@echo "     cs-check-intensive .................... Run complete code checking with"
-	@echo "                                             stricter coding standard"
-	@echo "     cs-check-intensive-full ............... Run complete code checking with"
-	@echo "                                             stricter coding standard and detailed output"
-	@echo "     possible Parameter:"
-	@echo "     > CHECKPATH=<path> ................. Run code checking on specific relative path"
-	@echo "     > SNIFFS=<sniff 1>,<sniff 2> ... Run code checking on specific sniffs"
-	@echo "     > OPTIONS=<option> ............. Run code checking with specific CodeSniffer options"
-
-# coding standard
-
-# #### config ####
-# cs-script path
-MSOURCE = $(CURDIR)/Makefile
-MSOURCE2 = $(CURDIR)/$(shell readlink $(MSOURCE))
-CSSPATH = $(shell dirname $(MSOURCE2))/
-
-# Parameter check
-ifndef CHECKPATH
-	CHECKPATH = "*"
-endif
-ifdef SNIFFS
-	SNIFFSTR = "--sniffs="$(SNIFFS)
-else
-	SNIFFSTR =
-endif
-
-REQUESTSTR = $(OPTIONS) $(SNIFFSTR)  $(CHECKPATH)
-
-cs-default:
-	chmod ugo+x "$(CSSPATH)cs-scripts.sh"
-	
-cs-enable: cs-default
-	$(CSSPATH)cs-scripts.sh -f $(shell dirname $(shell readlink $(MSOURCE))) -e
-
-cs-disable: cs-default
-	$(CSSPATH)cs-scripts.sh -d
-
-cs-check-commit:
-	$(CSSPATH)cs-scripts.sh -p ""
-cs-check-commit-emacs:
-	$(CSSPATH)cs-scripts.sh -p "-remacs"
-cs-check-commit-intensive:
-	$(CSSPATH)cs-scripts.sh -p "-s5"
-
-cs-check:
-	$(CSSPATH)cs-scripts.sh -c "-s --report=summary $(REQUESTSTR)"
-cs-check-intensive:
-	$(CSSPATH)cs-scripts.sh -s -c "-s --report=summary $(REQUESTSTR)"
-cs-check-intensive-full:
-	$(CSSPATH)cs-scripts.sh -s -c "-s --report=full $(REQUESTSTR)"
-cs-check-full:
-	$(CSSPATH)cs-scripts.sh -c "-s --report=full $(REQUESTSTR)"
-cs-check-emacs:
-	$(CSSPATH)cs-scripts.sh -c "--report=emacs $(REQUESTSTR)"
-cs-check-blame:
-	$(CSSPATH)cs-scripts.sh -s -c "--report=gitblame $(REQUESTSTR)"
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Classes/ClassFilePathSniff.php b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Classes/ClassFilePathSniff.php
index 302d7014d..f86205a61 100644
--- a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Classes/ClassFilePathSniff.php
+++ b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Classes/ClassFilePathSniff.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Commenting/FileCommentSniff.php b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Commenting/FileCommentSniff.php
index ee7fb6007..7b864a0d8 100644
--- a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Commenting/FileCommentSniff.php
+++ b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Commenting/FileCommentSniff.php
@@ -2,52 +2,37 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
- * Ontowiki_Sniffs_Commenting_FileCommentSniff.
- *
- * Test for the right file comment in all php files. Seperated check for the copyright Year
- *
+ * Parses and verifies the TYPO3 copyright notice.
  * PHP version 5
  *
  * @category  PHP
- * @package   PHP_CodeSniffer_Sniff
- * @author    Lars Eidam <lars.eidam@googlemail.com>
+ * @package   TYPO3SniffPool
+ * @author    Stefano Kowalke <blueduck@mailbox.org>
+ * @copyright 2015 Stefano Kowalke
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @link      https://github.com/typo3-ci/TYPO3SniffPool
  */
 
-/**
- * Ontowiki_Sniffs_Commenting_FileCommentSniff.
- * Check for functions, they are not allowed.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer_Sniff
- * @author    Lars Eidam <lars.eidam@googlemail.com>
- */
 class Ontowiki_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 {
-    private $_commentStr;
-    private $_yearRegEx = "/.*(?<year>[0-9]{4}).*/";
-    private $_dateLine = 3;
-    private $_dateColumn = 4;
-    private $_date;
-
-    public function __construct()
-    {
-        // this avoid timezone warnings
-        date_default_timezone_set('Europe/Berlin');
-        $this->_date = date("Y");
-        $this->_commentStr = array(
-        "/**\n",
-        " * This file is part of the {@link http://ontowiki.net OntoWiki} project.\n",
-        " *\n",
-        " * @copyright Copyright (c) 2006-$this->_date, {@link http://aksw.org AKSW}\n",
-        " * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)\n",
-        " */"
-        );
-    }
+    /**
+     * The file comment in TYPO3 CMS must be the copyright notice.
+     *
+     * @var array
+     */
+    protected $_copyright = array(
+        1  => "/**\n",
+        2  => " * This file is part of the {@link http://ontowiki.net OntoWiki} project.\n",
+        3  => " *\n",
+        4  => "",
+        5  => " * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)\n",
+        6  => " */",
+    );
 
     /**
      * Returns an array of tokens this test wants to listen for.
@@ -57,100 +42,140 @@ public function __construct()
     public function register()
     {
         return array(T_OPEN_TAG);
+
     }//end register()
 
+
     /**
      * Processes this test, when one of its tokens is encountered.
      *
      * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
      *
-     * @return void
+     * @return int
      */
     public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
+        // Find the next non whitespace token.
+        $commentStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+        if ($commentStart === false) {
+            $phpcsFile->addError('Not file level comment given', $commentStart, 'NoFileLevelCommentFound');
+            return;
+        }
 
-        // all line of a DocComment will be checked but if there was fount an error
-        // the Loop will break and only this error will be shown, because if there
-        // is one error in the DocComment it is quite likely that there are much
-        // more errors
-        foreach ($this->_commentStr as $commentStrLineNumber => $commentStrLine) {
-            $tokenNumber = $stackPtr + $commentStrLineNumber + 1;
+        $noGit = true;
+        if (count($tokens) > ($commentStart + 14)) {
+            preg_match("/ ([0-9]{4})(-[0-9]{4})?/", $tokens[$commentStart + 15]['content'], $nonGitYear);
+        }
 
-            if (!isset($tokens[$tokenNumber])) {
-                continue;
+        //test if a git exists to get the years from 'git log'
+        exec('([ -d .git ] && echo .git) || git rev-parse --git-dir 2> /dev/null', $gitTest);
+        if (!empty($gitTest)) {
+            $output = array();
+            exec('git ls-files --error-unmatch ' . $phpcsFile->getFilename() . ' 2> /dev/null', $output, $returnValue);
+            if ($returnValue == 0) {
+                $noGit = false;
             }
+        }
 
-            // check if every line direct after the php open tag is a doc comment line
-            if ("T_DOC_COMMENT" != $tokens[$tokenNumber]['type']) {
-                $error = 'Wrong DocComment: Found "%s" instead of the File Comment.';
-                $data = addcslashes($tokens[$tokenNumber]['content'], "\n");
-                $phpcsFile->addError($error, $tokenNumber, 'NoFileComment', $data);
-                return;
-            // check if ever comment line is the same as the defined one in the $commentStr
-            } else if ($commentStrLine != $tokens[$tokenNumber]['content']) {
-                $commentStrLinePartsDirty = explode(' ', $commentStrLine);
-                $commentStrLineParts = array();
-                foreach ($commentStrLinePartsDirty as $item) {
-                    if (trim($item) !== '') {
-                        $commentStrLineParts[] = trim($item);
-                    }
+        if (!$noGit) {
+            //test if a git entry exists to get the years from 'git log'
+            exec('git log --reverse ' . $phpcsFile->getFilename() . ' | head -4', $outputCreationYear);
+            //if(!empty($outputCreationYear)) {
+                preg_match("/( )[0-9]{4}( )/", $outputCreationYear[2], $gitOldYearArray);
+                if (empty($gitOldYearArray) && count($outputCreationYear) > 3) {
+                    preg_match("/( )[0-9]{4}( )/", $outputCreationYear[3], $gitOldYearArray);
                 }
-
-                $contentPartsDirty = explode(' ', $tokens[$tokenNumber]['content']);
-                $contentParts = array();
-                foreach ($contentPartsDirty as $item) {
-                    if (trim($item) !== '') {
-                        $contentParts[] = trim($item);
-                    }
+                $gitYearOld = str_replace(' ', '', $gitOldYearArray[0]);
+                if (isset($nonGitYear) && isset($nonGitYear[1]) && $gitYearOld > $nonGitYear[1]) {
+                    $gitYearOld = $nonGitYear[1];
                 }
-
-                if (count($commentStrLineParts) !== count($contentParts)) {
-                    // add error
-                    $data = $tokens[$tokenNumber]['content'];
-                    $error = 'Wrong DocComment: Found ' . $data . ' instead of "' . $commentStrLine . '".';
-                    $phpcsFile->addError($error, $tokenNumber, 'WrongFileCommentLine');
-                    return;
+                exec('git log -1 ' . $phpcsFile->getFilename(), $outputLastEditYear);
+                preg_match("/( )[0-9]{4}( )/", $outputLastEditYear[2], $gitNewYearArray);
+                if (empty($gitNewYearArray) && count($outputLastEditYear) > 3) {
+                    preg_match("/( )[0-9]{4}( )/", $outputLastEditYear[3], $gitNewYearArray);
                 }
-
-                foreach ($commentStrLineParts as $i => $part) {
-                    if ($part !== $contentParts[$i]) {
-                        if (($this->_dateLine === $commentStrLineNumber) && ($this->_dateColumn === $i)) {
-                            // add warning for wrong date
-                            $error = 'Wrong DocComment: Found "%s" instead of "' . $this->_date . '".';
-                            $phpcsFile->addWarning(
-                                $error,
-                                $tokenNumber,
-                                'WrongFileCommentYear',
-                                trim($contentParts[$i])
-                            );
-                            continue;
-                        } else {
-                            // add error
-                            $data = $contentParts[$i];
-                            $error = 'Wrong DocComment: Found ' . $data . ' instead of "' . $part . '".';
-                            $phpcsFile->addError($error, $tokenNumber, 'WrongFileCommentLine');
-                            return;
-                        }
-                    }
+                $gitYearNew = str_replace(' ', '', $gitNewYearArray[0]);
+                if (strcmp($gitYearOld, $gitYearNew) != 0) {
+                    $gitYearOld .= '-';
+                    $gitYearOld .= $gitYearNew;
                 }
+                $year = " * @copyright Copyright (c) " . $gitYearOld . ", {@link http://aksw.org AKSW}\n";
+                $this->_copyright[4] = $year;
+            //}
+        } else {
+            //tests if the file has no year/wrong editing and the year can't be found
+            if (!empty($nonGitYear)) {
+                $year = str_replace(' ', '', $nonGitYear[0]);
+                $copyright = " * @copyright Copyright (c) " . $year . ", {@link http://aksw.org AKSW}\n";
+                $this->_copyright[4] = $copyright;
             }
         }
 
-        // check if ever line after doc comment is a blank line
-        if (isset($tokens[$stackPtr + count($this->_commentStr) + 2])
-            && ("T_WHITESPACE" != $tokens[$stackPtr + count($this->_commentStr) + 2]['type'])
-        ) {
-            $data = addcslashes($tokens[$stackPtr + count($this->_commentStr) + 2]['content'], "\n");
-            $error = 'Wrong DocComment: Found "%s" instead of the blank line.';
+        $tokenizer = new PHP_CodeSniffer_Tokenizers_Comment();
+        $expectedString = implode($this->_copyright);
+        $expectedTokens = $tokenizer->tokenizeString($expectedString, PHP_EOL, 0);
+        // Allow namespace statements at the top of the file.
+        if ($tokens[$commentStart]['code'] === T_NAMESPACE) {
+            $semicolon    = $phpcsFile->findNext(T_SEMICOLON, ($commentStart + 1));
+            $commentStart = $phpcsFile->findNext(T_WHITESPACE, ($semicolon + 1), null, true);
+        }
+
+        if ($tokens[$commentStart]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
+            $fix = $phpcsFile->addFixableError(
+                'Copyright notice must start with /**; but /* was found!',
+                $commentStart,
+                'WrongStyle'
+            );
+
+            if ($fix === true) {
+                $phpcsFile->fixer->replaceToken($commentStart, "/**");
+            }
+            return;
+        }
+
+        $commentEnd = ($phpcsFile->findNext(T_WHITESPACE, ($commentStart + 1)) - 1);
+        if ($tokens[$commentStart]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
+            $phpcsFile->addError('Copyright notice missing', $commentStart, 'NoCopyrightFound');
+
+            return;
+        }
+        $commentEndLine = $tokens[$commentEnd]['line'];
+        $commentStartLine = $tokens[$commentStart]['line'];
+        if ((($commentEndLine - $commentStartLine) + 1) < count($this->_copyright)) {
+            $phpcsFile->addError(
+                'Copyright notice too short',
+                $commentStart,
+                'CommentTooShort'
+            );
+            return;
+        } else if ((($commentEndLine - $commentStartLine) + 1) > count($this->_copyright)) {
             $phpcsFile->addError(
-                $error,
-                $stackPtr + count($this->_commentStr) + 2,
-                'NoBlankLineAfterFileComment',
-                $data
+                'Copyright notice too long',
+                $commentStart,
+                'CommentTooLong'
             );
+            return;
+        }
+        $j = 0;
+        for ($i = $commentStart; $i <= $commentEnd; $i++) {
+            if ($tokens[$i]['content'] !== $expectedTokens[$j]["content"]) {
+                $error = 'Found wrong part of copyright notice. Expected "%s", but found "%s"';
+                $data  = array(
+                          $expectedTokens[$j]["content"],
+                          $tokens[$i]['content'],
+                         );
+                $fix   = $phpcsFile->addFixableError($error, $i, 'WrongText', $data);
+
+                if ($fix === true) {
+                    $phpcsFile->fixer->replaceToken($i, $expectedTokens[$j]["content"]);
+                }
+            }
+            $j++;
         }
     }//end process()
+
+
 }//end class
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/ControlStructures/MultiLineConditionSniff.php b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/ControlStructures/MultiLineConditionSniff.php
deleted file mode 100644
index 67a8d327c..000000000
--- a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/ControlStructures/MultiLineConditionSniff.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * This file is part of the {@link http://ontowiki.net OntoWiki} project.
- *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
- * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
- */
- 
-/**
- * Ontowiki_Sniffs_ControlStructures_MultiLineConditionSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Lars Eidam <lars.eidam@googlemail.com>
- * @link      http://code.google.com/p/ontowiki/
- */
-
-/**
- * Ontowiki_Sniffs_ControlStructures_MultiLineConditionSniff.
- *
- * Ensure multi-line IF conditions are defined correctly.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Lars Eidam <lars.eidam@googlemail.com>
- * @link      http://code.google.com/p/ontowiki/
- */
-class OntoWiki_Sniffs_ControlStructures_MultiLineConditionSniff implements PHP_CodeSniffer_Sniff
-{
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_IF,
-                T_ELSEIF,
-               );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We need to work out how far indented the if statement
-        // itself is, so we can work out how far to indent conditions.
-        $statementIndent = 0;
-        for ($i = ($stackPtr - 1); $i >= 0; $i--) {
-            if ($tokens[$i]['line'] !== $tokens[$stackPtr]['line']) {
-                $i++;
-                break;
-            }
-        }
-
-        if ($i >= 0 && $tokens[$i]['code'] === T_WHITESPACE) {
-            $statementIndent = strlen($tokens[$i]['content']);
-        }
-
-        // Each line between the parenthesis should be indented 4 spaces
-        // and start with an operator, unless the line is inside a
-        // function call, in which case it is ignored.
-        $openBracket  = $tokens[$stackPtr]['parenthesis_opener'];
-        $closeBracket = $tokens[$stackPtr]['parenthesis_closer'];
-        $lastLine     = $tokens[$openBracket]['line'];
-        $lineCount    = 0;
-        for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
-            if ($tokens[$i]['line'] !== $lastLine) {
-                $lineCount++;
-                if ($tokens[$i]['line'] !== $tokens[$closeBracket]['line']) {
-                    // check all lines exept the first, if there is a boolean operator at the beginning
-                    if (1 < $lineCount) {
-                        $next = $phpcsFile->findNext(T_WHITESPACE, $i, null, true);
-                        if (in_array($tokens[$next]['code'], PHP_CodeSniffer_Tokens::$booleanOperators) === false) {
-                            $error = 'Each line (except the first) in a multi-line IF statement must begin with a boolean operator';
-                            $phpcsFile->addError($error, $i, 'StartWithBoolean');
-                        }
-                    // check the first line, if there is no boolean operator in the whole line
-                    } else {
-                        $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$booleanOperators, $i, null, false);
-                        if ($tokens[$next]['line'] == $tokens[$i]['line']) {
-                            $error = 'The first line in a multi-line IF statement may have no boolean operator';
-                            $phpcsFile->addError($error, $i, 'FirstLineIncludeBoolean');
-                        }
-                    }
-                }
-
-                $lastLine = $tokens[$i]['line'];
-            }//end if
-
-            if ($tokens[$i]['code'] === T_STRING) {
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
-                if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
-                    // This is a function call, so skip to the end as they
-                    // have their own indentation rules.
-                    $i        = $tokens[$next]['parenthesis_closer'];
-                    $lastLine = $tokens[$i]['line'];
-                    continue;
-                }
-            }
-        }//end for
-
-    }//end process()
-
-
-}//end class
-
-?>
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/ForbiddenFunctionsSniff.php b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/ForbiddenFunctionsSniff.php
index 45e91401d..1992daf5b 100644
--- a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/ForbiddenFunctionsSniff.php
+++ b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/ForbiddenFunctionsSniff.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
index 170416a39..41f32876c 100644
--- a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
+++ b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/PHP/GetRequestDataSniff.php b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/PHP/GetRequestDataSniff.php
index e75c55fb2..5822d4682 100644
--- a/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/PHP/GetRequestDataSniff.php
+++ b/application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/PHP/GetRequestDataSniff.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/application/tests/CodeSniffer/Standards/Ontowiki/ruleset.xml b/application/tests/CodeSniffer/Standards/Ontowiki/ruleset.xml
index fc71921fa..193cb96aa 100644
--- a/application/tests/CodeSniffer/Standards/Ontowiki/ruleset.xml
+++ b/application/tests/CodeSniffer/Standards/Ontowiki/ruleset.xml
@@ -1,128 +1,4 @@
 <?xml version="1.0"?>
-<ruleset name="Ontowiki">
-    <description>A Ontowiki coding standard.</description>
-
-    <!-- Generic sniffs -->
-    <rule ref="Generic.Classes.DuplicateClassName" />
-    <!--<rule ref="Generic.CodeAnalysis.EmptyStatement" />-->
-    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
-    <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />
-    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" />
-    <!--<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter" />-->
-    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
-    <!--<rule ref="Generic.Commenting.Fixme" />-->
-    <!--<rule ref="Generic.Commenting.Todo" />-->
-    <rule ref="Generic.ControlStructures.InlineControlStructure" />
-    <rule ref="Generic.Files.ByteOrderMark" />
-    <rule ref="Generic.Files.EndFileNewline" />
-    <rule ref="Generic.Files.OneClassPerFile" />
-    <rule ref="Generic.Files.OneInterfacePerFile" />
-    <rule ref="Generic.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="100"/>
-            <property name="absoluteLineLimit" value="120"/>
-        </properties>
-    </rule>
-    <rule ref="Generic.Files.LineLength.TooLong">
-        <severity>3</severity>
-    </rule>
-    <rule ref="Generic.Files.LineEndings">
-        <properties>
-            <property name="eolChar" value="\n"/>
-        </properties>
-    </rule>
-    <rule ref="Generic.Files.LineEndings.InvalidEOLChar">
-        <severity>3</severity>
-    </rule>
-    <rule ref="Generic.Formatting.DisallowMultipleStatements" />
-    <!--<rule ref="Generic.Formatting.MultipleStatementAlignment" />-->
-    <rule ref="Generic.Formatting.NoSpaceAfterCast" />
-    <rule ref="Generic.Functions.CallTimePassByReference" />
-    <rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
-    <!--<rule ref="Generic.Metrics.CyclomaticComplexity" />-->
-    <!--<rule ref="Generic.Metrics.NestingLevel" />-->
-    <rule ref="Generic.NamingConventions.ConstructorName" />
-    <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
-    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
-    <rule ref="Generic.PHP.DeprecatedFunctions" />
-    <rule ref="Generic.PHP.DisallowShortOpenTag" />
-    <rule ref="Generic.PHP.LowerCaseConstant" />
-    <!--<rule ref="Generic.PHP.NoSilencedErrors" />-->
-    <!--<rule ref="Generic.Strings.UnnecessaryStringConcat" />-->
-    <rule ref="Generic.WhiteSpace.DisallowTabIndent" />
-
-    <!-- PEAR sniffs -->
-    <rule ref="PEAR.Classes.ClassDeclaration" />
-    <rule ref="PEAR.Commenting.InlineComment" />
-    <rule ref="PEAR.ControlStructures.ControlSignature" />
-    <rule ref="PEAR.ControlStructures.MultiLineCondition" />
-    <rule ref="PEAR.ControlStructures.MultiLineCondition.StartWithBoolean">
-        <exclude-pattern>*</exclude-pattern>
-    </rule>
-    <!--<rule ref="PEAR.Files.IncludingFile" />-->
-    <rule ref="PEAR.Formatting.MultiLineAssignment" />
-    <rule ref="PEAR.Functions.FunctionCallSignature" />
-    <rule ref="PEAR.Functions.FunctionDeclaration" />
-    <rule ref="PEAR.Functions.ValidDefaultValue" />
-    <rule ref="PEAR.NamingConventions.ValidClassName" />
-    <rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
-    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace" />
-    <!--<rule ref="PEAR.WhiteSpace.ScopeIndent" />-->
-
-    <!-- Squiz -->
-    <rule ref="Squiz.Arrays.ArrayBracketSpacing" />
-    <!--<rule ref="Squiz.Arrays.ArrayDeclaration" />-->
-    <rule ref="Squiz.Classes.LowercaseClassKeywords" />
-    <rule ref="Squiz.Classes.SelfMemberReference" />
-    <rule ref="Squiz.CodeAnalysis.EmptyStatement" />
-    <rule ref="Squiz.Commenting.EmptyCatchComment" />
-    <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
-    <rule ref="Squiz.Functions.GlobalFunction">
-        <exclude-pattern>index.php</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.Operators.IncrementDecrementUsage" />
-    <rule ref="Squiz.Operators.ValidLogicalOperators" />
-    <!--<rule ref="Squiz.PHP.CommentedOutCode" />-->
-    <!--<rule ref="Squiz.PHP.DisallowComparisonAssignment" />-->
-    <!--<rule ref="Squiz.PHP.DisallowMultipleAssignments" />-->
-    <rule ref="Squiz.PHP.DisallowObEndFlush" />
-    <rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops" />
-    <!--<rule ref="Squiz.PHP.DiscouragedFunctions" />-->
-    <rule ref="Squiz.PHP.EmbeddedPhp" />
-    <rule ref="Squiz.PHP.Eval" />
-    <rule ref="Squiz.PHP.ForbiddenFunctions" />
-    <rule ref="Squiz.PHP.GlobalKeyword" />
-    <rule ref="Squiz.PHP.Heredoc" />
-    <!--<rule ref="Squiz.PHP.InnerFunctions" />-->
-    <rule ref="Squiz.PHP.LowercasePHPFunctions" />
-    <rule ref="Squiz.PHP.NonExecutableCode" />
-    <rule ref="Squiz.Scope.MemberVarScope" />
-    <!--<rule ref="Squiz.Scope.MethodScope" />-->
-    <rule ref="Squiz.Scope.StaticThisUsage" />
-    <!--<rule ref="Squiz.Strings.DoubleQuoteUsage" />-->
-    <rule ref="Squiz.Strings.EchoedStrings" />
-    <!--<rule ref="Squiz.WhiteSpace.ControlStructureSpacing" />-->
-    <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace" />
-    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
-    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing" />
-    <rule ref="Squiz.WhiteSpace.OperatorSpacing" />
-    <rule ref="Squiz.WhiteSpace.PropertyLabelSpacing" />
-    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
-    <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />
-    <rule ref="Squiz.WhiteSpace.SemicolonSpacing" />
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
-
-    <!-- Zend -->
-    <rule ref="Zend.Files.ClosingTag.NotAllowed">
-        <exclude-pattern>*/Sniffs/*</exclude-pattern>
-    </rule>
-    <rule ref="Zend.NamingConventions.ValidVariableName" />
-
-    <!-- OntoWiki -->
-    <rule ref="Ontowiki.Commenting.FileComment.WrongFileCommentYear">
-        <severity>3</severity>
-    </rule>
-    <rule ref="Ontowiki.Functions.ForbiddenFunctions">
-        <exclude-pattern>application/tests/Bootstrap.php</exclude-pattern>
-    </rule>
+<ruleset name="OntoWiki">
+    <description>Ontowiki's additiona sniffs for the coding standard.</description>
 </ruleset>
diff --git a/application/tests/CodeSniffer/config b/application/tests/CodeSniffer/config
deleted file mode 100644
index 836dfa5fd..000000000
--- a/application/tests/CodeSniffer/config
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# #### config ####
-# if severity classes were chanced you must run 'cs-install' again
-# standard severity class they must be fulfilled to be able to commit
-SEVERITY=5
-# intensive severity class they must not be fulfilled to be able to commit,
-# but you are able to check your code with additional coding standards
-SEVERITY_INTENSIVE=3
-# checkt filetypes
-FILETYPES=php
-# path to the Ontowiki Coding Standard
-CSPATH=Standards/Ontowiki
diff --git a/application/tests/CodeSniffer/cs-scripts.sh b/application/tests/CodeSniffer/cs-scripts.sh
deleted file mode 100755
index db60c72af..000000000
--- a/application/tests/CodeSniffer/cs-scripts.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/bin/bash
-
-# get real directory of this script
-CSSOURCE="${BASH_SOURCE[0]}"
-while [ -h "$CSSOURCE" ] ; do CSSOURCE="$(readlink "$CSSOURCE")"; done
-CSDIR="$( cd -P "$( dirname "$CSSOURCE" )" && pwd )"
-
-# load config file
-source $CSDIR/config;
-
-# function install the Codesniffer Pear Package and enable the Codesniffer
-function cs-install() {
-    return_value=0
-    cs=`pear info PHP_CodeSniffer`;
-    if [[ $cs == "No information found for \`PHP_CodeSniffer'" ]]
-    then
-        user=`whoami`;
-        if [[ $user == "root" ]]
-        then
-            pear install PHP_CodeSniffer;
-            echo " CodeSniffer PEAR Package installed.";
-            return_value=0
-        else
-            echo " You need root privileges. Please run 'sudo make cs-install'.";
-            return_value=1
-        fi
-    else
-        echo " CodeSniffer PEAR Package already installed.";
-        return_value=1
-    fi
-    return $return_value;
-}
-
-# function uninstall the Codesniffer Pear Package and disable the Codesniffer
-function cs-uninstall() {
-    return_value=0
-    cs=`pear info PHP_CodeSniffer`;
-    if [[ $cs != "No information found for \`PHP_CodeSniffer'" ]]
-    then
-        user=`whoami`;
-        if [[ $user == "root" ]]
-        then
-            echo -n " Do you really want to uninstall PHP_CodeSniffer Package? (y/n): "
-            read CONFIRM;
-            if [[ $CONFIRM == "y" ]]
-            then
-                pear uninstall PHP_CodeSniffer;
-                echo " CodeSniffer PEAR Package uninstalled.";
-                return_value=0
-            else
-                echo " CodeSniffer PEAR Package not uninstalled.";
-                return_value=1
-            fi
-        else
-            echo " You need root privileges. Please run 'sudo make cs-uninstall'.";
-            return_value=1
-        fi
-    else
-        echo " CodeSniffer PEAR Package not uninstalled, because CodeSniffer PEAR Package was not installed.";
-        return_value=1
-    fi
-    return $return_value;
-}
-
-# function enables the CodeSniffer pre-commit
-function cs-enable() {
-    # get git directory of the current repo
-    GITDIR=`git rev-parse --git-dir`;
-    if `ln -s "../../$CSPATH/pre-commit" $GITDIR/hooks/pre-commit`
-    then
-        echo " CodeSniffer pre-commit enabled.";
-    else
-        echo " CodeSniffer pre-commit already enabled.";
-    fi
-}
-
-# function disables the CodeSniffer pre-commit
-function cs-disable() {
-    if `rm .git/hooks/pre-commit`
-    then
-        echo " CodeSniffer pre-commit disabled.";
-    else
-        echo " CodeSniffer pre-commit already disabled.";
-    fi
-}
-
-# function install the CodeSniffer Makefile-functions and pre-commit
-# on a submodule
-function cs-install-submodule() {
-    return_value=0
-    
-    # check if last letter is an "/", if not add a "/" at the end
-    LASTLETTER=${1: -1}
-    if  [[ $LASTLETTER != "/" ]]
-    then
-        MPATH=$1/
-    else
-        MPATH=$1
-    fi
-    
-    # check if first letters are "./", if so cut this letters
-    FIRSTLETTERS=${MPATH: 0: 2}
-    if  [[ $FIRSTLETTERS == "./" ]]
-    then
-        MPATH=${MPATH: 2}
-    fi
-    
-    BACKMPATH=${MPATH//[^\/]}
-    BACKMPATH=${BACKMPATH//\//..\/}
-    cs-install;
-    if `ln -s $BACKMPATH$CSPATH"Makefile" $MPATH"Makefile"`;
-    then
-        echo " CodeSniffer installed for Submodule '$MPATH'.";
-        return_value=0
-    else
-        echo " Can't install CodeSniffer for Submodule '$MPATH' because Makefile already exists.";
-        echo " Maybe CodeSniffer already installed!?";
-        return_value=1
-    fi
-    return $return_value;
-}
-# function uninstall the CodeSniffer Makefile-functions and pre-commit
-# on a submodule
-function cs-uninstall-submodule() {
-    return_value=0
-    
-    # check if last letter is an "/", if not add a "/" at the end
-    LASTLETTER=${1: -1}
-    if  [[ $LASTLETTER != "/" ]]
-    then
-        MPATH=$1/
-    else
-        MPATH=$1
-    fi
-    
-    # check if first letters are "./", if so cut this letters
-    FIRSTLETTERS=${MPATH: 0: 2}
-    if  [[ $FIRSTLETTERS == "./" ]]
-    then
-        MPATH=${MPATH: 2}
-    fi
-    
-    echo -n " Do you really want to uninstall CodeSniffer for Submodule '$MPATH'? (y/n): "
-    read CONFIRM;
-    if [[ $CONFIRM == "y" ]]
-    then
-        rm "$MPATH"Makefile
-        echo " CodeSniffer uninstalled for Submodule '$MPATH'.";
-        return_value=0
-    else
-        echo " CodeSniffer not uninstalled for Submodule '$MPATH'.";
-        return_value=1
-    fi
-    return $return_value;
-}
-
-# function run a CodeSniffer Check on specific files
-function cs-check() {
-    phpcs --extensions=$FILETYPES --severity=$SEVERITY -p --standard=$CSDIR/$CSPATH $1
-}
-
-# function run the CodeSniffer pre-commit
-function cs-check-precommit() {
-    $CSDIR/pre-commit $1
-}
-
-# this loop parse the paramter for this script
-while getopts ":iuedc:sp:m:f:n:" optname
-    do
-        case "$optname" in
-        "i")
-            if cs-install
-            then
-                cs-enable;
-            fi
-        ;;
-        "u")
-            if cs-uninstall
-            then
-                cs-disable;
-            fi
-        ;;
-        "e")
-            cs-enable;
-        ;;
-        "d")
-            cs-disable;
-        ;;
-        "m")
-            if cs-install-submodule "$OPTARG"
-            then
-               cd "$OPTARG";
-               make cs-enable;
-            fi
-        ;;
-        "n")
-            TEMPPATH=$(pwd)
-            cd "$OPTARG";
-            make cs-disable;
-            cd $TEMPPATH
-            cs-uninstall-submodule "$OPTARG"
-        ;;
-        "c")
-            cs-check "$OPTARG";
-        ;;
-        "p")
-            cs-check-precommit "$OPTARG";
-        ;;
-        "f")
-            CSPATH="$OPTARG";
-        ;;
-        "s")
-            SEVERITY=$SEVERITY_INTENSIVE;
-        ;;
-        "?")
-            echo "Unknown option $OPTARG"
-        ;;
-        ":")
-            echo "No argument value for option $OPTARG"
-        ;;
-        *)
-            # Should not occur
-            echo "Unknown error while processing options"
-        ;;
-    esac
-done
-
-exit 0;
diff --git a/application/tests/CodeSniffer/pre-commit b/application/tests/CodeSniffer/pre-commit
deleted file mode 100755
index e9743639f..000000000
--- a/application/tests/CodeSniffer/pre-commit
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-# PHP CodeSniffer pre-commit hook for git
-#
-# @author Lars Eidam <larseidam@googlemail.com>
-#
-# Git pre-commit hook to check chanced Code with the PHP CodeSniffer.
-# Features:
-#  - differnt severity, coding standard, whitelist filetypes and report types
-#    are possible
-#  - not be set parameter are taken from the Makefile
-#  - only added or chanced files in the staging area be tested
-#  - if partially files in the staging area, only the parts of the file in the
-#    staging area be checked, not the whole file (ATTENTION:it makes it a little
-#    bit difficult to find the right line were a error or warning is caused)
-#  - check if a commit goes to the AKSW/OntoWiki Master branch, if so the commit will
-#    be canceled, because it's forbidden to commit in this branch
-#
-
-PCSOURCE="${BASH_SOURCE[0]}"
-while [ -h "$PCSOURCE" ] ; do PCSOURCE="$(dirname $0)/$(readlink "$PCSOURCE")"; done
-PCDIR="$( cd -P "$( dirname "$PCSOURCE" )" && pwd )"
-
-source $PCDIR/config;
-
-# check if the commit goes to the master branch of AKSW/OntoWiki.git, if so the commit will be canceled
-# get the remote url
-REMOTEURL=$(git config remote.`git config branch.$(git rev-parse --abbrev-ref HEAD).remote`.url)
-if [[ $REMOTEURL =~ 'AKSW/OntoWiki.git' ]]; then
-    # get the current branch
-    BRANCH=$(git config branch.$(git rev-parse --abbrev-ref HEAD).merge | cut -d "/" -f 3-)
-    if [ "$BRANCH" == "master" ]; then
-        echo "A commit in the protected Master branch of AKSW/OntoWiki is forbidden. Commit canceled!"
-        exit 1
-    fi
-fi
-
-# folder for the tempary stage files
-TMP_STAGING=".tmp_staging"
-
-# set window-width
-WIDTH=80;
-
-# parse parameter for severity, cspath (path to the coding standard), filetypes
-# and reporttyp
-while getopts ":sp:f:r:" optname
-    do
-        case "$optname" in
-        "s")
-            SEVERITY=$SEVERITY_INTENSIVE;
-        ;;
-        "p")
-            CSPATH=$OPTARG
-        ;;
-        "f")
-            FILETYPES=$OPTARG
-        ;;
-        "r")
-            REPORT=$OPTARG
-        ;;
-        "?")
-            echo "Unknown option $OPTARG"
-        ;;
-        ":")
-            echo "No argument value for option $OPTARG"
-        ;;
-        *)
-            # Should not occur
-            echo "Unknown error while processing options"
-        ;;
-    esac
-done
-
-# if no parameter are set then read the parameter from the Makefile
-if [ -e $REPORT ]; then
-    REPORT="full"
-fi
-
-CSPATH=$PCDIR/$CSPATH
-
-# parameter for the CodeSniffer
-ARGS="-n -p -s --report=$REPORT --report-width=$WIDTH --severity=$SEVERITY --standard=$CSPATH"
-
-# check if CodeSniffer are found
-phpcs --version
-RETVAL=$?
-if [ "$RETVAL" -ne "0" ]; then
-    echo "PHP CodeSniffer bin not found or executable"
-    exit 1
-fi
-
-# get the reference commit
-if [ `git rev-parse --verify HEAD` ]; then
-    against='HEAD'
-else
-    # Initial commit: diff against an empty tree object
-    against='4b825dc642cb6eb9a060e54bf8d69288fbee4904'
-fi
-
-# retrieve all files in staging area that are added, modified or renamed
-# but no deletions etc
-COMMITFILES=$(git diff-index --name-only --cached --diff-filter=ACMR $against -- )
-
-if [ "$COMMITFILES" == "" ]; then
-    echo "No files to check with PHP CodeSniffer"
-    exit 0
-fi
-
-# clean and create temporary copy of staging area
-if [ -e $TMP_STAGING ]; then
-    rm -rf $TMP_STAGING
-fi
-mkdir $TMP_STAGING
-
-
-# match files against whitelist
-PHPCS_FILE_PATTERN=`echo $FILETYPES | tr , '|'`
-PHPCS_FILE_PATTERN="\.("$PHPCS_FILE_PATTERN")$"
-FILES_TO_CHECK=""
-FILES_COUNT=0;
-for FILE in $COMMITFILES
-do
-    echo "$FILE" | egrep -q "$PHPCS_FILE_PATTERN"
-    RETVAL=$?
-    if [ "$RETVAL" -eq "0" ]; then
-        FILES_TO_CHECK="$FILES_TO_CHECK $FILE"
-        FILES_COUNT=$((FILES_COUNT+1))
-    fi
-done
-if [ "$FILES_TO_CHECK" == "" ]; then
-    rm -rf $TMP_STAGING
-    echo "No files to check with PHP CodeSniffer"
-    exit 0
-fi
-# if more than 5 files to check then show only a summary
-if [[ $FILES_COUNT > 5 ]]; then
-    ARGS="$ARGS --report=summary"
-else
-    ARGS="$ARGS --report=$REPORT"
-fi
-
-# Copy contents of staged version of files to temporary staging area
-# because we only want the staged version that will be commited and not
-# the version in the working directory
-STAGED_FILES=""
-for FILE in $FILES_TO_CHECK
-do
-  ID=$(git diff-index --cached HEAD $FILE | cut -d " " -f4)
-  # create staged version of file in temporary staging area with the same
-  # path as the original file so that the phpcs ignore filters can be applied
-  mkdir -p "$TMP_STAGING/$(dirname $FILE)"
-  git cat-file blob $ID > "$TMP_STAGING/$FILE"
-  STAGED_FILES="$STAGED_FILES $TMP_STAGING/$FILE"
-done
-
-OUTPUT=$(phpcs $ARGS $STAGED_FILES)
-RETVAL=$?
-
-# delete temporary copy of staging area
-rm -rf $TMP_STAGING
-
-OUTPUT=${OUTPUT//.tmp_staging\//}
-
-# check for output
-if [ $RETVAL -ne 0 ]; then
-    echo "$OUTPUT"
-fi
-
-exit $RETVAL
diff --git a/application/tests/config.ini.dist b/application/tests/config.ini.dist
index 768ec8d12..2d24910a5 100644
--- a/application/tests/config.ini.dist
+++ b/application/tests/config.ini.dist
@@ -6,11 +6,11 @@
 
 store.backend = zenddb ; zenddb, virtuoso, multi
 
-store.zenddb.dbname   = erfurt_TEST ; needs to end with _TEST
+store.zenddb.dbname   = ow_TEST ; needs to end with _TEST
 store.zenddb.username = php
 store.zenddb.password = php
 store.zenddb.dbtype   = mysql     ; mysql
-;store.zenddb.host     = localhost ; default is localhost
+store.zenddb.host     = localhost ; default is localhost
 
 store.virtuoso.dsn      = VOS_TEST ; needs to end with _TEST
 store.virtuoso.username = dba
diff --git a/application/tests/integration/OntoWiki/Extension/ManagerIntegrationTest.php b/application/tests/integration/OntoWiki/Extension/ManagerIntegrationTest.php
index 704380a26..301009bb3 100644
--- a/application/tests/integration/OntoWiki/Extension/ManagerIntegrationTest.php
+++ b/application/tests/integration/OntoWiki/Extension/ManagerIntegrationTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -45,7 +45,8 @@ protected function setUp()
      */
     public function testScan()
     {
-        $this->markTestSkipped('TODO: test with new caching backend');
+        Erfurt_App::getInstance(false)->getCache()->clean();
+
         // clear cache, since otherwise the extension manager may have the real extensions loaded
         if (function_exists('apc_clear_cache')) {
             apc_clear_cache('user');
diff --git a/application/tests/integration/OntoWiki/Model/InstancesIntegrationTest.php b/application/tests/integration/OntoWiki/Model/InstancesIntegrationTest.php
index 9478ba2ea..462c15027 100644
--- a/application/tests/integration/OntoWiki/Model/InstancesIntegrationTest.php
+++ b/application/tests/integration/OntoWiki/Model/InstancesIntegrationTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -31,9 +31,10 @@ class OntoWiki_Model_InstancesIntegrationTest extends Erfurt_TestCase
     public function setUp()
     {
         $this->markTestNeedsDatabase();
-        $this->_store = $this->getStore();
         $this->authenticateDbUser();
 
+        $this->_store = $this->getStore();
+
         //create model
         $model = $this->_store->getNewModel($this->_modelUri, '', Erfurt_Store::MODEL_TYPE_OWL, false);
 
@@ -44,6 +45,8 @@ public function setUp()
 
         $this->addTestData();
 
+        $this->_instances->getResources();
+
         parent::setUp();
     }
 
@@ -106,15 +109,10 @@ public function testGetValues()
         $this->assertArrayHasKey('http://model.org/model#i1', $v);
         $this->assertArrayHasKey('http://model.org/model#i2', $v);
 
-        // the __TYPE and resourceUri
-        $this->assertCount(2, $v['http://model.org/model#i1']);
+        // the __TYPE
+        $this->assertCount(1, $v['http://model.org/model#i1']);
         $this->assertArrayHasKey('__TYPE', $v['http://model.org/model#i1']);
-        $this->assertArrayHasKey('resourceUri', $v['http://model.org/model#i1']);
         $this->assertContains($this->_class, self::_onlyValues($v['http://model.org/model#i1']['__TYPE']));
-        $this->assertContains(
-            'http://model.org/model#i1',
-            self::_onlyValues($v['http://model.org/model#i1']['resourceUri'])
-        );
     }
 
     /**
@@ -125,8 +123,9 @@ public function testAddShownProperties()
         //add properties
         $this->_instances->addShownProperty('http://model.org/prop');
         $v = $this->_instances->getValues();
+        //var_dump($v);
         //count values
-        $this->assertCount(3, $v['http://model.org/model#i1']);
+        $this->assertCount(2, $v['http://model.org/model#i1']);
         //test variable creation
         $this->assertArrayHasKey('prop', $v['http://model.org/model#i1']);
 
@@ -138,7 +137,7 @@ public function testAddShownProperties()
         //another one
         $this->_instances->addShownProperty('http://www.w3.org/2000/01/rdf-schema#label');
         $v = $this->_instances->getValues();
-        $this->assertCount(4, $v['http://model.org/model#i1']);
+        $this->assertCount(3, $v['http://model.org/model#i1']);
         $this->assertArrayHasKey('label', $v['http://model.org/model#i1']);
     }
 
@@ -225,24 +224,17 @@ public function testOrderURI()
         $this->assertEquals($r[0]['uri'], 'http://model.org/model#i2');
     }
 
-    public function testShownPropertiesAdd()
+    /**
+     *
+     */
+    public function testShownPropertiesAddTitles()
     {
         //add
         $r = $this->_instances->addShownProperty("http://abc");
         //test chaining
         $this->assertSame($this->_instances, $r);
-
-        return $this->_instances;
-    }
-
-    /**
-     *
-     * @depends testShownPropertiesAdd
-     */
-    public function testShownPropertiesAddTitles(OntoWiki_Model_Instances $i)
-    {
         //verify triple in value query
-        $propertiesWithTitles = $i->getShownProperties();
+        $propertiesWithTitles = $this->_instances->getShownProperties();
         $this->assertCount(2, $propertiesWithTitles);
     }
 
diff --git a/application/tests/integration/OntoWiki/Model/TitleHelperIntegrationTest.php b/application/tests/integration/OntoWiki/Model/TitleHelperIntegrationTest.php
index ef771e4cf..802a2830b 100644
--- a/application/tests/integration/OntoWiki/Model/TitleHelperIntegrationTest.php
+++ b/application/tests/integration/OntoWiki/Model/TitleHelperIntegrationTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -34,14 +34,21 @@ public function setUp()
 
     private function _addTestData()
     {
-        $model = $this->_store->getNewModel($this->_modelUri, '', Erfurt_Store::MODEL_TYPE_OWL, false);
+        $model = $this->_store->getNewModel(
+            $this->_modelUri, '', Erfurt_Store::MODEL_TYPE_OWL, false
+        );
         $this->authenticateDbUser();
         $turtleString
-            = '<http://purl.org/dc/terms/title> <http://www.w3.org/2000/01/rdf-schema#label> "testABC_en"@en .'
-            . '<http://example.org/resourceXYZ> <http://www.w3.org/2004/02/skos/core#prefLabel> "testABC_noLang" ;'
-            . '                                 <http://www.w3.org/2000/01/rdf-schema#label> "testABC_de"@de .'
-            . '<http://example.org/graph123/resourceABC> <http://www.w3.org/2000/01/rdf-schema#label> "testABC" ;'
-            . '                                          <http://ns.ontowiki.net/SysOnt/Site/menuLabel> "testMenuLabel" .';
+            = '<http://purl.org/dc/terms/title> '
+            . '<http://www.w3.org/2000/01/rdf-schema#label> "testABC_en"@en .'
+            . '<http://example.org/resourceXYZ> '
+            . '<http://www.w3.org/2004/02/skos/core#prefLabel> "testABC_noLang" ;'
+            . '                                 '
+            . '<http://www.w3.org/2000/01/rdf-schema#label> "testABC_de"@de .'
+            . '<http://example.org/graph123/resourceABC> '
+            . '<http://www.w3.org/2000/01/rdf-schema#label> "testABC" ;'
+            . '                                          '
+            . '<http://ns.ontowiki.net/SysOnt/Site/menuLabel> "testMenuLabel" .';
 
         $this->_store->importRdf(
             $this->_modelUri,
diff --git a/application/tests/unit/OntoWiki/Extension/ManagerTest.php b/application/tests/unit/OntoWiki/Extension/ManagerTest.php
index fb3b51e26..b1411d546 100644
--- a/application/tests/unit/OntoWiki/Extension/ManagerTest.php
+++ b/application/tests/unit/OntoWiki/Extension/ManagerTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -17,229 +17,172 @@ class ManagerTest extends PHPUnit_Framework_TestCase
     public function testTriple2ConfigArray()
     {
         $triples = array(
-            'file:///home/jonas/programming/php-workspace/ow/extensions/account/' =>
-            array(
-                'http://xmlns.com/foaf/0.1/primaryTopic' =>
-                array(
-                    0 =>
-                    array(
+            'file:///home/jonas/programming/php-workspace/ow/extensions/account/' => array(
+                'http://xmlns.com/foaf/0.1/primaryTopic' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/account/raw/master/doap.n3#account',
                     ),
                 ),
             ),
-            'https://github.com/AKSW/account/raw/master/doap.n3#account'          =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                =>
-                array(
-                    0 =>
-                    array(
+            'https://github.com/AKSW/account/raw/master/doap.n3#account'          => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://usefulinc.com/ns/doap#Project',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#name'                              =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#name'                              => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'account',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/privateNamespace' =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/privateNamespace' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/account/raw/master/doap.n3#',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/enabled'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/enabled'          => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Login Module',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#description'                       =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#description'                       => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'provides a login module and a recover action.',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/authorLabel'      =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/authorLabel'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'AKSW',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#maintainer'                        =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#maintainer'                        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://aksw.org',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/templates'        =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/templates'        => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'templates',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/languages'        =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/languages'        => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'languages',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/hasModule'        =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/hasModule'        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/account/raw/master/doap.n3#Default',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'           =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'           => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node1',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#release'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#release'                           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/account/raw/master/doap.n3#v1-0',
                     ),
                 ),
             ),
-            'https://github.com/AKSW/account/raw/master/doap.n3#Default'          =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'        =>
-                array(
-                    0 =>
-                    array(
+            'https://github.com/AKSW/account/raw/master/doap.n3#Default'          => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Module',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'             =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'             => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Default',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/caching'  =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/caching'  => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/priority' =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/priority' => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '40',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/context'  =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/context'  => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'main.sidewindows',
                     ),
                 ),
             ),
-            '_:node1'                                                             =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node1'                                                             => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'allow',
                     ),
                 ),
-                'https://github.com/AKSW/account/raw/master/doap.n3#local'  =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/account/raw/master/doap.n3#local'  => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/account/raw/master/doap.n3#webid'  =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/account/raw/master/doap.n3#webid'  => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/account/raw/master/doap.n3#openid' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/account/raw/master/doap.n3#openid' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            'https://github.com/AKSW/account/raw/master/doap.n3#v1-0'             =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' =>
-                array(
-                    0 =>
-                    array(
+            'https://github.com/AKSW/account/raw/master/doap.n3#v1-0'             => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://usefulinc.com/ns/doap#Version',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#revision'           =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#revision'           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '1.0',
                     ),
@@ -259,1615 +202,1219 @@ public function testTriple2ConfigArray()
     public function testTriple2ConfigArray2()
     {
         $triples = array(
-            'file:///home/jonas/programming/php-workspace/ow/extensions/navigation/' =>
-            array(
-                'http://xmlns.com/foaf/0.1/primaryTopic' =>
-                array(
-                    0 =>
-                    array(
+            'file:///home/jonas/programming/php-workspace/ow/extensions/navigation/' => array(
+                'http://xmlns.com/foaf/0.1/primaryTopic' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/navigation/raw/master/doap.n3#navigation',
                     ),
                 ),
             ),
-            'https://github.com/AKSW/navigation/raw/master/doap.n3#navigation'       =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                =>
-                array(
-                    0 =>
-                    array(
+            'https://github.com/AKSW/navigation/raw/master/doap.n3#navigation'       => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://usefulinc.com/ns/doap#Project',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#name'                              =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#name'                              => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'navigation',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/privateNamespace' =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/privateNamespace' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/navigation/raw/master/doap.n3#',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/enabled'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/enabled'          => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Navigation Module',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#description'                       =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#description'                       => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'an extensible and highly customizable module to navigate in knowledge bases ' .
                             'via tree-based information (e.g. classes)',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/authorLabel'      =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/authorLabel'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'AKSW',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#maintainer'                        =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#maintainer'                        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://aksw.org',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/templates'        =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/templates'        => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'templates',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/languages'        =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/languages'        => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'languages',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/hasModule'        =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/hasModule'        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/navigation/raw/master/doap.n3#Default',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'           =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'           => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node1',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node2',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'bnode',
                         'value' => '_:node4',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#release'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#release'                           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'https://github.com/AKSW/navigation/raw/master/doap.n3#v1-0',
                     ),
                 ),
             ),
-            'https://github.com/AKSW/navigation/raw/master/doap.n3#Default'          =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'        =>
-                array(
-                    0 =>
-                    array(
+            'https://github.com/AKSW/navigation/raw/master/doap.n3#Default'          => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Module',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'             =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'             => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Default',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/context'  =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/context'  => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'main.sidewindows',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/priority' =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/priority' => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '30',
                     ),
                 ),
             ),
-            '_:node1'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                  =>
-                array(
-                    0 =>
-                    array(
+            '_:node1'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                  => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                 => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'defaults',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#config'     =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#config'     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'classes',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#limit'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#limit'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '10',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkTypes' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkTypes' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showMenu'   =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showMenu'   => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node2'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'      =>
-                array(
-                    0 =>
-                    array(
+            '_:node2'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'sorting',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config' =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config' => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node3',
                     ),
                 ),
             ),
-            '_:node3'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'            =>
-                array(
-                    0 =>
-                    array(
+            '_:node3'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'            => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'           =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'label',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                 => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'By Label',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#type' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#type' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2000/01/rdf-schema#label',
                     ),
                 ),
             ),
-            '_:node4'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'      =>
-                array(
-                    0 =>
-                    array(
+            '_:node4'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config' =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config' => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node5',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node9',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'bnode',
                         'value' => '_:node13',
                     ),
-                    3 =>
-                    array(
+                    3 => array(
                         'type'  => 'bnode',
                         'value' => '_:node16',
                     ),
-                    4 =>
-                    array(
+                    4 => array(
                         'type'  => 'bnode',
                         'value' => '_:node19',
                     ),
-                    5 =>
-                    array(
+                    5 => array(
                         'type'  => 'bnode',
                         'value' => '_:node22',
                     ),
-                    6 =>
-                    array(
+                    6 => array(
                         'type'  => 'bnode',
                         'value' => '_:node25',
                     ),
-                    7 =>
-                    array(
+                    7 => array(
                         'type'  => 'bnode',
                         'value' => '_:node28',
                     ),
                 ),
             ),
-            '_:node5'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                            =>
-                array(
-                    0 =>
-                    array(
+            '_:node5'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                            => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'classes',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                                 =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                                 => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Classes',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#cache'                =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#cache'                => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'            =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'            => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkVisibility'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkVisibility'      => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes'       => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2002/07/owl#Class',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2000/01/rdf-schema#Class',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                       =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                       => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node6',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node7',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'bnode',
                         'value' => '_:node8',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hiddenNS'             =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hiddenNS'             => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2000/01/rdf-schema#',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2002/07/owl#',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hiddenRelation'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hiddenRelation'       => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/hidden',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showImplicitElements' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showImplicitElements' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showEmptyElements'    =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showEmptyElements'    => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'           =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'           => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'             =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'             => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hideDefaultHierarchy' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hideDefaultHierarchy' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node6'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          =>
-                array(
-                    0 =>
-                    array(
+            '_:node6'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2000/01/rdf-schema#subClassOf',
                     ),
                 ),
             ),
-            '_:node7'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node7'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'instanceRelation',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type',
                     ),
                 ),
             ),
-            '_:node8'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'              =>
-                array(
-                    0 =>
-                    array(
+            '_:node8'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'              => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'             =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'             => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'list',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#config' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#config' => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '{|filter|:[{|rdfsclass|:|%resource%|,|mode|:|rdfsclass|}]}',
                     ),
                 ),
             ),
-            '_:node9'                                                                =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                            =>
-                array(
-                    0 =>
-                    array(
+            '_:node9'                                                                => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                            => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'properties',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                                 =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                                 => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Properties',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'            =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'            => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes'       => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#Property',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2002/07/owl#DatatypeProperty',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2002/07/owl#ObjectProperty',
                     ),
-                    3 =>
-                    array(
+                    3 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2002/07/owl#AnnotationProperty',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                       =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                       => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node10',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node11',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'bnode',
                         'value' => '_:node12',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showImplicitElements' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showImplicitElements' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showEmptyElements'    =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showEmptyElements'    => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'           =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'           => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hideDefaultHierarchy' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hideDefaultHierarchy' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'             =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'             => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node10'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          =>
-                array(
-                    0 =>
-                    array(
+            '_:node10'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2000/01/rdf-schema#subPropertyOf',
                     ),
                 ),
             ),
-            '_:node11'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node11'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'instanceRelation',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2000/01/rdf-schema#subPropertyOf',
                     ),
                 ),
             ),
-            '_:node12'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'              =>
-                array(
-                    0 =>
-                    array(
+            '_:node12'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'              => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'             =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'             => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'list',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#config' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#config' => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '{|shownProperties|:[{|uri|:|%resource%|,|label|:|Label 1|,|action|:|add|,' .
                             '|inverse|:false}],|filter|:[{|property|:|%resource%|,|filter|:|bound|}]}',
                     ),
                 ),
             ),
-            '_:node13'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      =>
-                array(
-                    0 =>
-                    array(
+            '_:node13'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'spatial',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Spatial',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/SpatialArea',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/Planet',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/Continent',
                     ),
-                    3 =>
-                    array(
+                    3 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/Country',
                     ),
-                    4 =>
-                    array(
+                    4 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/Province',
                     ),
-                    5 =>
-                    array(
+                    5 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/District',
                     ),
-                    6 =>
-                    array(
+                    6 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/City',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node14',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node15',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
             ),
-            '_:node14'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          =>
-                array(
-                    0 =>
-                    array(
+            '_:node14'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/spatialHierarchy/isLocatedIn',
                     ),
                 ),
             ),
-            '_:node15'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node15'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'instanceRelation',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/addressFeatures/physical/country',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.aksw.org/addressFeatures/physical/city',
                     ),
                 ),
             ),
-            '_:node16'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      =>
-                array(
-                    0 =>
-                    array(
+            '_:node16'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'faun',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Faunistics',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#Family',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#Genus',
                     ),
-                    2 =>
-                    array(
+                    2 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#Species',
                     ),
-                    3 =>
-                    array(
+                    3 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#Order',
                     ),
-                    4 =>
-                    array(
+                    4 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#SubOrder',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node17',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node18',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'       => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node17'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          =>
-                array(
-                    0 =>
-                    array(
+            '_:node17'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#subTaxonOf',
                     ),
                 ),
             ),
-            '_:node18'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node18'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'instanceRelation',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://purl.org/net/faunistics#identifiesAs',
                     ),
                 ),
             ),
-            '_:node19'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      =>
-                array(
-                    0 =>
-                    array(
+            '_:node19'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'skos',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'SKOS',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2004/02/skos/core#Concept',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node20',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node21',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'     =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'     => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node20'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node20'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in'  =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in'  => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2004/02/skos/core#broader',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2004/02/skos/core#narrower',
                     ),
                 ),
             ),
-            '_:node21'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node21'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'instanceRelation',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in'  =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in'  => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2004/02/skos/core#narrower',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.w3.org/2004/02/skos/core#broader',
                     ),
                 ),
             ),
-            '_:node22'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      =>
-                array(
-                    0 =>
-                    array(
+            '_:node22'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'org',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Groups',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://xmlns.com/foaf/0.1/Group',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'uri',
                         'value' => 'http://xmlns.com/foaf/0.1/Organization',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node23',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node24',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'     =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'     => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node23'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node23'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/subGroup',
                     ),
                 ),
             ),
-            '_:node24'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           =>
-                array(
-                    0 =>
-                    array(
+            '_:node24'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'           => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'          => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'instanceRelation',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in'  =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in'  => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://xmlns.com/foaf/0.1/member',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#out' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://xmlns.com/foaf/0.1/member_of',
                     ),
                 ),
             ),
-            '_:node25'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                            =>
-                array(
-                    0 =>
-                    array(
+            '_:node25'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                            => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'go',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                                 =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                                 => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Gene Ontology',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes'       => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.geneontology.org/dtds/go.dtd#term',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                       =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                       => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node26',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node27',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'            =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'            => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'           =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#showCounts'           => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'             =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'             => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hideDefaultHierarchy' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hideDefaultHierarchy' => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'false',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
             ),
-            '_:node26'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          =>
-                array(
-                    0 =>
-                    array(
+            '_:node26'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.geneontology.org/dtds/go.dtd#is_a',
                     ),
                 ),
             ),
-            '_:node27'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'             =>
-                array(
-                    0 =>
-                    array(
+            '_:node27'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'             => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'            =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'            => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'list',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#query' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#query' => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'SELECT DISTINCT ?resourceUri WHERE { ?resourceUri <http://www.geneontology.org/' .
                             'GO.format.gaf-2_0.shtml#go_id> <%resource%> }',
                     ),
                 ),
             ),
-            '_:node28'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      =>
-                array(
-                    0 =>
-                    array(
+            '_:node28'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                      => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                     => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'checklist',
                     ),
                 ),
-                'http://www.w3.org/2000/01/rdf-schema#label'                           =>
-                array(
-                    0 =>
-                    array(
+                'http://www.w3.org/2000/01/rdf-schema#label'                           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Checklist',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#titleMode'      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'titleHelper',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#hierarchyTypes' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.mindswap.org/2003/owl/geo/geoFeatures.owl#Country',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/config'                 => array(
+                    0 => array(
                         'type'  => 'bnode',
                         'value' => '_:node29',
                     ),
-                    1 =>
-                    array(
+                    1 => array(
                         'type'  => 'bnode',
                         'value' => '_:node30',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#checkSub'       => array(
+                    0 => array(
                         'type'     => 'literal',
                         'value'    => 'true',
                         'datatype' => 'http://www.w3.org/2001/XMLSchema#boolean',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#rootName'       =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#rootName'       => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'Caucasus Spiders',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#rootURI'        =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#rootURI'        => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://db.caucasus-spiders.info/Area/152',
                     ),
                 ),
             ),
-            '_:node29'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          =>
-                array(
-                    0 =>
-                    array(
+            '_:node29'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'          => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'         => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'hierarchyRelations',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#in' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://www.mindswap.org/2003/owl/geo/geoFeatures.owl#within',
                     ),
                 ),
             ),
-            '_:node30'                                                               =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                       =>
-                array(
-                    0 =>
-                    array(
+            '_:node30'                                                               => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'                       => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://ns.ontowiki.net/SysOnt/ExtensionConfig/Config',
                     ),
                 ),
-                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                      =>
-                array(
-                    0 =>
-                    array(
+                'http://ns.ontowiki.net/SysOnt/ExtensionConfig/id'                      => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'list',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#shownProperties' =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#shownProperties' => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '{|uri|:|http://purl.org/net/faunistics#citationSuffix|,|label|:|citation suffix|' .
                             ',|action|:|add|,|inverse|:false}',
                     ),
                 ),
-                'https://github.com/AKSW/navigation/raw/master/doap.n3#query'           =>
-                array(
-                    0 =>
-                    array(
+                'https://github.com/AKSW/navigation/raw/master/doap.n3#query'           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => 'SELECT DISTINCT ?resourceUri ?famUri WHERE { ?recUri <http://purl.org/net/' .
                             'faunistics#recordedAtLocation> ?resourceLocation OPTIONAL{ ?resourceLocation ' .
@@ -1882,20 +1429,15 @@ public function testTriple2ConfigArray2()
                     ),
                 ),
             ),
-            'https://github.com/AKSW/navigation/raw/master/doap.n3#v1-0'             =>
-            array(
-                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' =>
-                array(
-                    0 =>
-                    array(
+            'https://github.com/AKSW/navigation/raw/master/doap.n3#v1-0'             => array(
+                'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' => array(
+                    0 => array(
                         'type'  => 'uri',
                         'value' => 'http://usefulinc.com/ns/doap#Version',
                     ),
                 ),
-                'http://usefulinc.com/ns/doap#revision'           =>
-                array(
-                    0 =>
-                    array(
+                'http://usefulinc.com/ns/doap#revision'           => array(
+                    0 => array(
                         'type'  => 'literal',
                         'value' => '1.0',
                     ),
diff --git a/application/tests/unit/OntoWiki/Model/InstancesTest.php b/application/tests/unit/OntoWiki/Model/InstancesTest.php
index f56de93d7..68fc22aae 100644
--- a/application/tests/unit/OntoWiki/Model/InstancesTest.php
+++ b/application/tests/unit/OntoWiki/Model/InstancesTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -44,6 +44,8 @@ public function setUp()
             'Test'
         );
 
+        $this->_store->setAc(new Erfurt_Ac_Test());
+
         $this->_instances = new OntoWiki_Model_Instances(
             $this->_store,
             new Erfurt_Rdf_Model('http://graph.com/123/', null, $this->_store)
diff --git a/application/tests/unit/OntoWiki/UtilsTest.php b/application/tests/unit/OntoWiki/UtilsTest.php
new file mode 100644
index 000000000..de7b4436f
--- /dev/null
+++ b/application/tests/unit/OntoWiki/UtilsTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * This file is part of the {@link http://ontowiki.net OntoWiki} project.
+ *
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
+/**
+ * This test class comtains tests for the OntoWiki Utils.
+ *
+ * @category   OntoWiki
+ * @package    OntoWiki
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2016, {@link http://aksw.org AKSW}
+ * @license    http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPLv2)
+ * @author     Natanael Arndt <arndtn@gmail.com>
+ */
+class OntoWiki_UtilsTest extends PHPUnit_Framework_TestCase
+{
+    public function testMatchMimetypeFromRequest()
+    {
+        $request = new Zend_Controller_Request_HttpTestCase();
+        $request->setHeader("Accept", "text/*");
+        $support = array(
+            "text/ttl",
+            "application/rdf+xml"
+        );
+        $mime = OntoWiki_Utils::matchMimetypeFromRequest($request, $support);
+        $this->assertEquals($mime, "text/ttl");
+    }
+}
diff --git a/application/tests/unit/controller/ResourceControllerTest.php b/application/tests/unit/controller/ResourceControllerTest.php
index 62ef01e72..3e5dff418 100644
--- a/application/tests/unit/controller/ResourceControllerTest.php
+++ b/application/tests/unit/controller/ResourceControllerTest.php
@@ -23,71 +23,20 @@ public function setUp()
         $this->setUpUnitTest();
     }
 
-    public function testDummyTestUnlessNoWorkingActualTestExists()
+    public function testExportActionReturnsCorrectContentTypeForTurtle()
     {
-        $this->assertTrue(true);
+        $r = 'http://example.org/resource1';
+        $m = 'http://example.org/model1/';
+        $this->_storeAdapter->createModel($m);
+
+        $this->request->setParam('r', $r);
+        $this->request->setParam('m', $m);
+        $this->request->setParam('f', 'turtle');
+        $this->dispatch('/resource/export');
+
+        $this->assertController('resource');
+        $this->assertAction('export');
+        $this->assertResponseCode(200);
+        $this->assertHeaderContains('Content-Type', 'text/turtle');
     }
-
-    /*
-        public function testListInstantiation()
-        {
-            $this->request->setMethod('POST')
-                ->setPost(
-                array(
-                    'list' => 'instances',
-                    'init' => true,
-                )
-            );
-
-            $this->dispatch('/list');
-
-            $this->assertController('resource');
-            $this->assertAction('instances');
-            $this->assertResponseCode(200);
-        }
-
-
-        public function testListConfig()
-        {
-            $c = array(
-                'filter' => array(
-                    'action' => 'add',
-                    'mode' => 'box',
-                    'filter' => 'equals',
-                    'value' => 'http://test.com/'
-                )
-            );
-            $this->request->setMethod('POST')
-                ->setPost(
-                array(
-                    'list' => 'instances',
-                    'init' => true,
-                    'instancesconfig' => json_encode($c)
-                )
-            );
-
-            $this->dispatch('/list');
-
-            $this->assertController('resource');
-            $this->assertAction('instances');
-            $this->assertResponseCode(200);
-        }
-
-        public function testListError()
-        {
-            $c = array();
-            $this->request->setMethod('POST')
-                ->setPost(
-                array(
-                    'list' => 'newone',
-                    //no init parameter
-                    'instancesconfig' => json_encode($c)
-                )
-            );
-
-            $this->dispatch('/list');
-
-            $this->assertController('error');
-        }
-    */
 }
diff --git a/application/views/templates/error/error.phtml b/application/views/templates/error/error.phtml
index 66a607b61..5f2f643b0 100644
--- a/application/views/templates/error/error.phtml
+++ b/application/views/templates/error/error.phtml
@@ -42,7 +42,7 @@ body {
 <?php endif; ?>
 </h1>
 <details>
-<summary><?php echo $this->errorText ?></summary>
+<summary><?php echo $this->escape($this->errorText) ?></summary>
 <?php if (isset($this->exceptionType)): ?>
 <p><code><?php echo $this->exceptionType ?></code></p>
 <?php endif; ?>
diff --git a/application/views/templates/layouts/layout.phtml b/application/views/templates/layouts/layout.phtml
index bf7f368b4..c15549197 100644
--- a/application/views/templates/layouts/layout.phtml
+++ b/application/views/templates/layouts/layout.phtml
@@ -58,8 +58,9 @@
     <?php echo $this->headStyle() ?>
 
     <!-- jQuery -->
-    <script type="text/javascript" src="<?php echo $this->themeUrlBase ?>scripts/libraries/jquery.js"></script>
-    <script type="text/javascript" src="<?php echo $this->themeUrlBase ?>scripts/libraries/jquery-ui.js"></script>
+    <script type="text/javascript" src="<?php echo $this->themeUrlBase ?>scripts/libraries/jquery-1.9.1.js"></script>
+    <script type="text/javascript" src="<?php echo $this->themeUrlBase ?>scripts/libraries/jquery-migrate-1.3.0.js"></script>
+    <script type="text/javascript" src="<?php echo $this->themeUrlBase ?>scripts/libraries/jquery-ui-1.8.22.js"></script>
 
     <!-- included js libraries -->
     <script type="text/javascript" src="<?php echo $this->themeUrlBase ?>scripts/libraries/jquery.json.js"></script>
@@ -104,7 +105,6 @@
                 /**
                  * @trigger onDisplayMainWindowTitle
                  */
-                require_once 'Erfurt/Event.php';
                 $event = new Erfurt_Event('onDisplayMainWindowTitle');
                 $event->setDefault($this->placeholder('main.window.title'));
                 $title = $event->trigger();
diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..fbee34d97
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,43 @@
+{
+    "name": "aksw/ontowiki",
+    "description": "Semantic data wiki as well as Linked Data publishing engine",
+    "type": "application",
+    "keywords": ["OntoWiki", "Linked Data", "Semantic Web", "RDF", "Triple Store"],
+    "license": "GPL-2.0",
+    "authors": [
+        {
+            "name": "Natanael Arndt",
+            "email": "arndtn@gmail.com"
+        },
+        {
+            "name": "AKSW",
+            "homepage": "http://aksw.org"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0",
+        "mnsami/composer-custom-directory-installer": "1.1.*",
+        "aksw/erfurt": "1.8.*",
+        "bitworking/mimeparse": "2.1.*",
+        "zendframework/zendframework1": "1.*",
+        "aksw/rdfauthor": "dev-develop"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.5.*",
+        "squizlabs/php_codesniffer": "dev-master"
+    },
+    "extra": {
+        "installer-paths": {
+	    "./libraries/RDFauthor": ["aksw/rdfauthor"]
+	}
+    },
+    "autoload": {
+        "classmap": [
+            "extensions/",
+            "application/Bootstrap.php",
+            "application/classes/",
+            "application/controllers/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..a5dabd642
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,1421 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "62e9c85570eb53d3b65184648f0c35fe",
+    "content-hash": "d137f1a2b7f45fb7081294fda432daa0",
+    "packages": [
+        {
+            "name": "aksw/erfurt",
+            "version": "v1.8.0-rc.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/AKSW/Erfurt.git",
+                "reference": "a0e6ee5b358bb0d8ca9b997877d10146bb96078e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/AKSW/Erfurt/zipball/a0e6ee5b358bb0d8ca9b997877d10146bb96078e",
+                "reference": "a0e6ee5b358bb0d8ca9b997877d10146bb96078e",
+                "shasum": ""
+            },
+            "require": {
+                "easyrdf/easyrdf": "0.9.*",
+                "php": ">=5.4.0",
+                "semsol/arc2": "*",
+                "zendframework/zendframework1": "1.*"
+            },
+            "require-dev": {
+                "ceus-media/common": "dev-master",
+                "ceus-media/doc-creator": "dev-master",
+                "pdepend/pdepend": "2.2.*",
+                "phploc/phploc": "2.1.*",
+                "phpmd/phpmd": "2.4.*",
+                "phpunit/phpunit": "4.5.*",
+                "sebastian/phpcpd": "2.0.*",
+                "squizlabs/php_codesniffer": "dev-master",
+                "white-gecko/arrays": "*",
+                "zerkalica/php-code-browser": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "library/antlr/",
+                    "library/Erfurt/",
+                    "tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "AKSW",
+                    "homepage": "http://aksw.org"
+                }
+            ],
+            "description": "PHP/Zend based Semantic Web API for Social Semantic Software",
+            "keywords": [
+                "Erfurt",
+                "Linked Data",
+                "Query Cache",
+                "RDF",
+                "Semantic Web",
+                "Triple Store",
+                "parser",
+                "serializer"
+            ],
+            "time": "2016-09-12 13:16:26"
+        },
+        {
+            "name": "aksw/rdfauthor",
+            "version": "dev-develop",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/AKSW/RDFauthor.git",
+                "reference": "6e8193443d3d519db10d00a6d6d6d63690fdc051"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/AKSW/RDFauthor/zipball/6e8193443d3d519db10d00a6d6d6d63690fdc051",
+                "reference": "6e8193443d3d519db10d00a6d6d6d63690fdc051",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "AKSW",
+                    "homepage": "http://aksw.org"
+                },
+                {
+                    "name": "Norman Heino",
+                    "email": "norman.heino@gmail.com"
+                }
+            ],
+            "description": "RDFauthor creates formular widgets out of RDFa-enhanced webpages.",
+            "keywords": [
+                "Linked Data",
+                "RDF",
+                "RDFauthor",
+                "Semantic Web",
+                "authoring",
+                "curation",
+                "editing"
+            ],
+            "time": "2016-04-14 11:51:40"
+        },
+        {
+            "name": "bitworking/mimeparse",
+            "version": "2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/conneg/mimeparse-php.git",
+                "reference": "db3f7be1ab4d9bfff5764e56ad84872eb3b87c1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/conneg/mimeparse-php/zipball/db3f7be1ab4d9bfff5764e56ad84872eb3b87c1c",
+                "reference": "db3f7be1ab4d9bfff5764e56ad84872eb3b87c1c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "jakub-onderka/php-parallel-lint": "0.8.*",
+                "phpunit/phpunit": "~4.5",
+                "satooshi/php-coveralls": "0.6.*",
+                "squizlabs/php_codesniffer": "~2.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Bitworking\\": "src/Bitworking/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Joe Gregorio",
+                    "homepage": "http://bitworking.org"
+                },
+                {
+                    "name": "Andrew \"Venom\" K."
+                },
+                {
+                    "name": "Ben Ramsey",
+                    "homepage": "http://benramsey.com"
+                }
+            ],
+            "description": "Basic functions for handling mime-types, forked from Joe Gregorio's mimeparse library <http://code.google.com/p/mimeparse/>.",
+            "keywords": [
+                "accept",
+                "http",
+                "mime"
+            ],
+            "time": "2015-04-25 17:28:31"
+        },
+        {
+            "name": "easyrdf/easyrdf",
+            "version": "0.9.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/njh/easyrdf.git",
+                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
+                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-pcre": "*",
+                "php": ">=5.2.8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.5",
+                "sami/sami": "~1.4",
+                "squizlabs/php_codesniffer": "~1.4.3"
+            },
+            "suggest": {
+                "ml/json-ld": "~1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "EasyRdf_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nicholas Humfrey",
+                    "email": "njh@aelius.com",
+                    "homepage": "http://www.aelius.com/njh/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Alexey Zakhlestin",
+                    "email": "indeyets@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
+            "homepage": "http://www.easyrdf.org/",
+            "keywords": [
+                "Linked Data",
+                "RDF",
+                "Semantic Web",
+                "Turtle",
+                "rdfa",
+                "sparql"
+            ],
+            "time": "2015-02-27 09:45:49"
+        },
+        {
+            "name": "mnsami/composer-custom-directory-installer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mnsami/composer-custom-directory-installer.git",
+                "reference": "8cc82e0c5801cc3bf53ba452afdcaa5c6ff645a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mnsami/composer-custom-directory-installer/zipball/8cc82e0c5801cc3bf53ba452afdcaa5c6ff645a5",
+                "reference": "8cc82e0c5801cc3bf53ba452afdcaa5c6ff645a5",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": ">=5.3"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": [
+                    "Composer\\CustomDirectoryInstaller\\LibraryPlugin",
+                    "Composer\\CustomDirectoryInstaller\\PearPlugin",
+                    "Composer\\CustomDirectoryInstaller\\PluginPlugin"
+                ],
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Composer\\CustomDirectoryInstaller": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mina Nabil Sami",
+                    "email": "mina.nsami@gmail.com"
+                }
+            ],
+            "description": "A composer plugin, to help install packages of different types in custom paths.",
+            "keywords": [
+                "composer",
+                "composer-installer",
+                "composer-plugin"
+            ],
+            "time": "2016-05-25 08:26:02"
+        },
+        {
+            "name": "semsol/arc2",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/semsol/arc2.git",
+                "reference": "89e3467129c56a9517befd92a131e0ad3a01fb4c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/semsol/arc2/zipball/89e3467129c56a9517befd92a131e0ad3a01fb4c",
+                "reference": "89e3467129c56a9517befd92a131e0ad3a01fb4c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./",
+                    "parsers/",
+                    "serializers/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "W3C"
+            ],
+            "authors": [
+                {
+                    "name": "Benji Nowack",
+                    "email": "mail@bnowack.de",
+                    "homepage": "http://bnowack.de/"
+                }
+            ],
+            "description": "Semsol's ARC2 RDF library",
+            "homepage": "https://github.com/semsol/arc2",
+            "keywords": [
+                "RDF",
+                "sparql"
+            ],
+            "time": "2016-06-30 06:20:14"
+        },
+        {
+            "name": "zendframework/zendframework1",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zf1.git",
+                "reference": "a90f3a8d71e0788020f730da83674b7312bd3b16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zf1/zipball/a90f3a8d71e0788020f730da83674b7312bd3b16",
+                "reference": "a90f3a8d71e0788020f730da83674b7312bd3b16",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.11"
+            },
+            "require-dev": {
+                "phpunit/dbunit": "1.3.*",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend_": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework 1",
+            "homepage": "http://framework.zend.com/",
+            "keywords": [
+                "ZF1",
+                "framework"
+            ],
+            "time": "2016-09-08 14:54:20"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a",
+                "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2016-03-31 10:24:22"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "d3be8294e4729abcf8e6e207f25cdcb299cd1c88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d3be8294e4729abcf8e6e207f25cdcb299cd1c88",
+                "reference": "d3be8294e4729abcf8e6e207f25cdcb299cd1c88",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2016-09-21 19:41:08"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06 15:47:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10 15:34:57"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2016-05-12 18:03:57"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cab6c6fefee93d7b7c3a01292a0fe0884ea66644",
+                "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-09-23 14:46:55"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.5.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
+                "phpunit/php-file-iterator": "~1.3.2",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "~1.0.2",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.1",
+                "sebastian/environment": "~1.2",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-03-29 09:24:05"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02 06:51:40"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-07-26 15:48:44"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-08-18 05:49:44"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17 09:04:28"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7",
+                "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-01-28 05:39:29"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "a3cb3163988f6ec1646d8a06b2c0c7b30798ce54"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a3cb3163988f6ec1646d8a06b2c0c7b30798ce54",
+                "reference": "a3cb3163988f6ec1646d8a06b2c0c7b30798ce54",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2016-09-25 22:43:32"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "2.8.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
+                "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-09-02 01:57:56"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": {
+        "aksw/rdfauthor": 20,
+        "squizlabs/php_codesniffer": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.4.0"
+    },
+    "platform-dev": []
+}
diff --git a/config.ini.dist b/config.ini.dist
index ebbd0cc34..f0ae821a3 100644
--- a/config.ini.dist
+++ b/config.ini.dist
@@ -103,35 +103,35 @@ mail.localname.recovery = "ontowiki-account-recovery"
 ;vhosts[] = "http://graph2.ontowiki.de"
 
 ;;;;
-;; Uncomment this line to turn off the query and object cache (NOT recommended)
+;; Uncomment this line to turn on the query and object cache (experimental)
 ;;
-;cache.enable       = false
-;cache.query.enable = false
+;cache.enable       = true
+;cache.query.enable = true
 
 
-;; Options for cache frontend
-cache.frontend.enable                               = true
-cache.frontend.lifetime                             = 0
+;; Options for cache frontend (experimental)
+;cache.frontend.enable                              = true
+;cache.frontend.lifetime                            = 0
 ;cache.frontend.logging                             = false
 ;cache.frontend.write_control                       = true
 ;cache.frontend.automatic_cleaning_factor           = 10
 ;cache.frontend.ignore_user_abort                   = false
-cache.frontend.cache_id_prefix                      = 'OW_'
+;cache.frontend.cache_id_prefix                     = 'OW_'
 
 ;; Cache backend options
 ;; Available: file | memcached | database | sqlite | apc
 ;; Recommended: memcached | file
-cache.backend.type                                  = "file"
- 
+;cache.backend.type                                 = "file"
+
 ;; Options for file cache backend
-cache.backend.file.cache_dir                        = "./cache/"
-cache.backend.file.file_locking                     = NULL
+;cache.backend.file.cache_dir                       = "./cache/"
+;cache.backend.file.file_locking                    = NULL
 
 ;; Options for memcached cache backend
 ;cache.backend.memcached.compression                = false
 ;cache.backend.memcached.compatibility              = false
 ;; You can define several servers: copy block, below and increase number and configure properly
-cache.backend.memcached.servers.0.host              = "localhost"
+;cache.backend.memcached.servers.0.host             = "localhost"
 ;cache.backend.memcached.servers.0.port             = 11211
 ;cache.backend.memcached.servers.0.persistent       = true
 ;cache.backend.memcached.servers.0.weight           = 1
@@ -144,12 +144,14 @@ cache.backend.sqlite.cache_db_complete_path         = "/tmp/ow_cache.sqlite"
 ;cache.backend.sqlite.automatic_vacuum_factor       = 10
 
 
-;; Options for Gearman/worker
-worker.enable	= false
+;; Options for Gearman/worker (experimental)
+;worker.enable	= true
 
+;; Option for specifying the RSS/Atom feed loaded in the OntoWiki index actions "News" module
+;; set to "false" to completely disable the feed
+;news.feedUrl = "http://blog.aksw.org/feed/?cat=5&client={{version.label}}&version={{version.number}}&suffix={{version.suffix}}"
 
 ;;;;
 ;; uncomment this line if you need more information
 ;;
 ;debug = true
-
diff --git a/extensions/account/AccountController.php b/extensions/account/AccountController.php
index cb13b60ef..584425fd8 100644
--- a/extensions/account/AccountController.php
+++ b/extensions/account/AccountController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -51,7 +51,7 @@ public function recoverAction()
         // phase 3 for cleanup and password change in ow system
         $params['password_o'] = $this->getParam('password_o');
         $params['password_r'] = $this->getParam('password_r');
-        if (empty($params['hash']) || empty($params['password_o']) || empty ($params['password_r'])) {
+        if (empty($params['hash']) || empty($params['password_o']) || empty($params['password_r'])) {
             unset($params['password_o']);
             unset($params['password_r']);
         } else {
@@ -63,8 +63,6 @@ public function recoverAction()
         $this->view->placeholder('main.window.title')->set($title);
         $this->view->phase = $phase;
 
-        require_once 'Erfurt/Auth/Identity/Recovery.php';
-
         $recoveryObject = new Erfurt_Auth_Identity_Recovery();
 
         try {
diff --git a/extensions/account/LoginModule.php b/extensions/account/LoginModule.php
index 5dcfaa1d8..fd4750bec 100644
--- a/extensions/account/LoginModule.php
+++ b/extensions/account/LoginModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/application/ApplicationModule.php b/extensions/application/ApplicationModule.php
index bfcb1c553..f457718aa 100644
--- a/extensions/application/ApplicationModule.php
+++ b/extensions/application/ApplicationModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/auth/AuthController.php b/extensions/auth/AuthController.php
index 79faac85c..abecfbe9e 100644
--- a/extensions/auth/AuthController.php
+++ b/extensions/auth/AuthController.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright  Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license    http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 require_once 'OntoWiki/Controller/Component.php';
diff --git a/extensions/autologin/AutologinPlugin.php b/extensions/autologin/AutologinPlugin.php
index 66a2ef1e3..f54d8591a 100644
--- a/extensions/autologin/AutologinPlugin.php
+++ b/extensions/autologin/AutologinPlugin.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright  Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license    http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 require_once 'OntoWiki/Plugin.php';
diff --git a/extensions/basicimporter/BasicimporterPlugin.php b/extensions/basicimporter/BasicimporterPlugin.php
index 5f540e3f1..a203796cb 100644
--- a/extensions/basicimporter/BasicimporterPlugin.php
+++ b/extensions/basicimporter/BasicimporterPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2013-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -23,6 +23,14 @@ public function onProvideImportActions($event)
         $this->provideImportActions($event);
     }
 
+    /**
+     * Listen for the store initialization event
+     */
+    public function onSetupStore($event)
+    {
+     //   $this->importModels();
+    }
+
     /*
      * here we add new import actions
      */
@@ -57,4 +65,32 @@ private function provideImportActions($event)
         $event->importActions = array_merge($event->importActions, $myImportActions);
         return $event;
     }
+
+    private function importModels()
+    {
+        // read config for models to import
+        $owApp = OntoWiki::getInstance();
+        $models = $this->_privateConfig->setup->model->toArray();
+        foreach ($models as $info) {
+            // import models
+            $path = ONTOWIKI_ROOT . '/' . $info['path'];
+            $uri = $info['uri'];
+            $hidden = $info['hidden'];
+            $this->_import($uri, $path);
+        }
+    }
+
+    private function _import($modelIri, $fileOrUrl)
+    {
+        try {
+            Erfurt_App::getInstance()->getStore()->importRdf($modelIri, $fileOrUrl);
+        } catch (Erfurt_Exception $e) {
+            // re-throw
+            throw new OntoWiki_Controller_Exception(
+                'Could not import given model: ' . $e->getMessage(),
+                0,
+                $e
+            );
+        }
+    }
 }
diff --git a/extensions/basicimporter/doap.n3 b/extensions/basicimporter/doap.n3
index 63f21c34b..7da85ede4 100644
--- a/extensions/basicimporter/doap.n3
+++ b/extensions/basicimporter/doap.n3
@@ -11,7 +11,7 @@
 :extension a doap:Project ;
   doap:name "basicimporter" ;
   owconfig:privateNamespace <http://ns.ontowiki.net/Extensions/basicimporter/> ;
-  owconfig:pluginEvent event:onProvideImportActions ;
+  owconfig:pluginEvent event:onProvideImportActions, event:onSetupStore ;
   owconfig:enabled "true"^^xsd:boolean ;
   rdfs:label "Basic Data Import Actions" ;
   doap:description "provides import from web an RDF files" ;
diff --git a/extensions/bookmarklet/BookmarkletModule.php b/extensions/bookmarklet/BookmarkletModule.php
index 94a123f13..5142e4a4b 100644
--- a/extensions/bookmarklet/BookmarkletModule.php
+++ b/extensions/bookmarklet/BookmarkletModule.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright  Copyright (c) 2012, {@link http://aksw.org AKSW}
- * @license    http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
diff --git a/extensions/ckan/CkanController.php b/extensions/ckan/CkanController.php
index 0884fbb40..f46ad2473 100644
--- a/extensions/ckan/CkanController.php
+++ b/extensions/ckan/CkanController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/ckan/CkanHelper.php b/extensions/ckan/CkanHelper.php
index 2996d7742..d25410636 100644
--- a/extensions/ckan/CkanHelper.php
+++ b/extensions/ckan/CkanHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/ckan/default.ini b/extensions/ckan/default.ini
index ba5c31270..505df090d 100644
--- a/extensions/ckan/default.ini
+++ b/extensions/ckan/default.ini
@@ -1,4 +1,4 @@
-enabled     = true
+enabled     = false
 name        = "CKAN Integration"
 description = "allows for registration of CKAN datasets from your OntoWiki instance"
 author      = "Sebastian Tramp"
diff --git a/extensions/ckan/doap.n3 b/extensions/ckan/doap.n3
index c2a1d89b9..dba019b75 100644
--- a/extensions/ckan/doap.n3
+++ b/extensions/ckan/doap.n3
@@ -11,7 +11,7 @@
 :ckan a doap:Project ;
   doap:name "ckan" ;
   owconfig:privateNamespace <https://github.com/AKSW/ckan/raw/master/doap.n3#> ;
-  owconfig:enabled "true"^^xsd:boolean ;
+  owconfig:enabled "false"^^xsd:boolean ;
   rdfs:label "CKAN Integration" ;
   doap:description "allows for registration of CKAN datasets from your OntoWiki instance" ;
   owconfig:authorLabel "Sebastian Tramp" ;
diff --git a/extensions/community/CommentModule.php b/extensions/community/CommentModule.php
index 2c0427a82..29f2f0c1c 100644
--- a/extensions/community/CommentModule.php
+++ b/extensions/community/CommentModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/community/CommunityController.php b/extensions/community/CommunityController.php
index 670da06aa..aa286ffea 100644
--- a/extensions/community/CommunityController.php
+++ b/extensions/community/CommunityController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -162,13 +162,14 @@ public function rateAction()
                 '
                 prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
                 prefix ns0: <http://rdfs.org/sioc/ns#>
-                prefix ns1: <http://rdfs.org/sioc/types#>
-                SELECT *'
-            )->setWherePart(
+                prefix ns1: <http://rdfs.org/sioc/types#>'
+            );
+            $query->setSelectClause('SELECT *');
+            $query->setWherePart(
                 'where {
-                    ?rating rdf:type ns1:Poll.
-                    ?rating ns0:about <' . $this->_owApp->selectedResource . '>.
-                    ?rating ns0:has_creator ?creator}'
+                ?rating rdf:type ns1:Poll.
+                ?rating ns0:about <' . $this->_owApp->selectedResource . '>.
+                ?rating ns0:has_creator ?creator}'
             );
 
             $results = $model->sparqlQuery($query);
diff --git a/extensions/community/CommunityHelper.php b/extensions/community/CommunityHelper.php
index 50c8adb43..355b409ca 100644
--- a/extensions/community/CommunityHelper.php
+++ b/extensions/community/CommunityHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/community/LastchangesModule.php b/extensions/community/LastchangesModule.php
index 72a99a749..aa64d5f7f 100644
--- a/extensions/community/LastchangesModule.php
+++ b/extensions/community/LastchangesModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -75,8 +75,13 @@ public function getContents()
 
                 if (Erfurt_Uri::check($change['resource'])) {
                     $change['aresource'] = new OntoWiki_Resource((string)$change['useruri'], $this->systemModel);
-                    $change['author']    = $change['aresource']->getTitle() ? $change['aresource']->getTitle()
-                        : OntoWiki_Utils::getUriLocalPart($change['aresource']);
+
+                    if ($change['aresource']->getTitle()) {
+                        $change['author'] = $change['aresource']->getTitle();
+                    } else {
+                        $change['author'] = OntoWiki_Utils::getUriLocalPart($change['aresource']);
+                    }
+
                     $url->setParam('r', (string)$change['aresource'], true);
                     $change['ahref'] = (string)$url;
 
@@ -84,8 +89,12 @@ public function getContents()
                     $url->setParam('r', (string)$change['resource'], true);
                     $change['rhref']    = (string)$url;
                     $change['resource'] = new OntoWiki_Resource((string)$change['resource'], $this->model);
-                    $change['rname']    = $change['resource']->getTitle() ? $change['resource']->getTitle()
-                        : OntoWiki_Utils::contractNamespace($change['resource']->getIri());
+
+                    if ($change['resource']->getTitle()) {
+                        $change['rname'] = $change['resource']->getTitle();
+                    } else {
+                        $change['rname'] = OntoWiki_Utils::contractNamespace($change['resource']->getIri());
+                    }
 
                     $changes[] = $change;
                 }
diff --git a/extensions/community/RatingModule.php b/extensions/community/RatingModule.php
index 18a625c39..e74eb3b0c 100644
--- a/extensions/community/RatingModule.php
+++ b/extensions/community/RatingModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -40,14 +40,15 @@ public function getContents()
             'prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
              prefix ns0: <http://rdfs.org/sioc/ns#>
              prefix ns1: <http://rdfs.org/sioc/types#>
-             prefix terms: <http://purl.org/dc/terms/>
-             SELECT *'
-        )->setWherePart(
+             prefix terms: <http://purl.org/dc/terms/>'
+        );
+        $query->setSelectClause('SELECT *');
+        $query->setWherePart(
             'where {
-                ?rating rdf:type ns1:Poll.
-                ?rating ns0:about <' . $this->_owApp->selectedResource . '>.
-                ?rating ns0:note ?note.
-                ?rating ns0:has_creator ?creator}'
+            ?rating rdf:type ns1:Poll.
+            ?rating ns0:about <' . $this->_owApp->selectedResource . '>.
+            ?rating ns0:note ?note.
+            ?rating ns0:has_creator ?creator}'
         );
 
         $results = $this->_store->sparqlQuery($query);
@@ -124,7 +125,7 @@ private function typeAllowed()
 
             $query = new Erfurt_Sparql_SimpleQuery();
 
-            $query->setProloguePart('SELECT *')->setWherePart(
+            $query->setSelectClause('SELECT *')->setWherePart(
                 'WHERE {
                     <' . $resource . '> <' . EF_RDF_TYPE . '> ?type
                 }'
diff --git a/extensions/community/rating.js b/extensions/community/rating.js
index e3024a1f8..8dcf3ae5b 100644
--- a/extensions/community/rating.js
+++ b/extensions/community/rating.js
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(document).ready(function() {
 
     var rating_disp = document.getElementsByName('rating');
@@ -71,8 +75,6 @@ $(document).ready(function() {
         tab5.style.display = '';
     }
 
-
-
     $('#changebutton').click(function(){
         tab0.style.display = '';
         tab1.style.display = '';
@@ -85,11 +87,11 @@ $(document).ready(function() {
     });
 
     $('#ratingfield').mouseout(function(){
- 
+
     $('#submit').val(getCheckedValue(rating_in));
- 
+
     });
- 
+
 });
 
 function getCheckedValue(radioObj) {
@@ -107,9 +109,4 @@ function getCheckedValue(radioObj) {
         }
     }
     return "";
-}
-
-
-
-
-
+}
\ No newline at end of file
diff --git a/extensions/community/styles/community.css b/extensions/community/styles/community.css
index 4f7ea5de7..f3ea7f8c6 100644
--- a/extensions/community/styles/community.css
+++ b/extensions/community/styles/community.css
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 .comment {
     background-image: ;
 }
\ No newline at end of file
diff --git a/extensions/community/templates/partials/list_community_item.phtml b/extensions/community/templates/partials/list_community_item.phtml
index 61f8796ca..a4c2e846c 100644
--- a/extensions/community/templates/partials/list_community_item.phtml
+++ b/extensions/community/templates/partials/list_community_item.phtml
@@ -1,3 +1,9 @@
+<?php
+$author = $this->author;
+if ($author === null) {
+    $author = '<em>anonymous</em>';
+}
+?>
     <tr
         about="<?php echo $this->comment ?>"
         resource="<?php echo $this->comment ?>"
@@ -13,7 +19,7 @@
                         </span>
                     </a>
                 </div>
-                <strong><?php echo $this->author ?></strong>
+                <strong><?= $author ?></strong>
                 <?php if (isset($this->resource)) : ?>
                 on 
                 <a
diff --git a/extensions/community/templates/partials/list_community_main.phtml b/extensions/community/templates/partials/list_community_main.phtml
index 543207d8d..5ce01a5ed 100644
--- a/extensions/community/templates/partials/list_community_main.phtml
+++ b/extensions/community/templates/partials/list_community_main.phtml
@@ -2,10 +2,14 @@
 <?php
 $odd = true;
 foreach ($this->instanceInfo as $instance){
+    $author = null;
+    if (isset($this->instanceData[$instance['uri']]['creator'][0]['value'])) {
+        $author = $this->instanceData[$instance['uri']]['creator'][0]['value'];
+    }
     $options = array(
-        'author'        => $this->instanceData[$instance['uri']]['creator'][0]['value'],
+        'author'        => $author,
         'comment'       => $instance['uri'],
-        'commentUrl'    => $this->instanceData[$instance['uri']]['resourceUri'][0]['url'],
+        'commentUrl'    => $instance['url'],
         'content'       => $this->instanceData[$instance['uri']]['content'][0]['value'],
         'date'          => OntoWiki_Utils::dateDifference(strtotime($this->instanceData[$instance['uri']]['date'][0]['value']), time()),
         'odd'           => $odd,
diff --git a/extensions/cors/CorsPlugin.php b/extensions/cors/CorsPlugin.php
index dc77aec59..221dc4281 100644
--- a/extensions/cors/CorsPlugin.php
+++ b/extensions/cors/CorsPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -33,7 +33,7 @@ private function addCorsHeader()
         /*
          * TODO: allow more CORS header fields here
          */
-        if (isset ($this->_privateConfig->accessControlAllowOrigin)) {
+        if (isset($this->_privateConfig->accessControlAllowOrigin)) {
             $value = $this->_privateConfig->accessControlAllowOrigin;
             $response->setHeader('Access-Control-Allow-Origin', $value, true);
         }
diff --git a/extensions/datagathering/DatagatheringController.php b/extensions/datagathering/DatagatheringController.php
index 4028f9762..a4032d719 100644
--- a/extensions/datagathering/DatagatheringController.php
+++ b/extensions/datagathering/DatagatheringController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -578,7 +578,7 @@ private function _searchLocalPropertiesOnly(array $termsArray, $modelUri, $limit
     {
         require_once 'Erfurt/Sparql/SimpleQuery.php';
         $query = new Erfurt_Sparql_SimpleQuery();
-        $query->setProloguePart('SELECT DISTINCT ?uri ?o');
+        $query->setSelectClause('SELECT DISTINCT ?uri ?o');
 
         if (null !== $modelUri) {
             $query->addFrom($modelUri);
@@ -740,6 +740,16 @@ public function importAction()
             throw new OntoWiki_Exception("model must be selected or specified with the m parameter");
         }
 
+        $presets = array();
+        if (isset($this->_privateConfig->fetch->preset)) {
+            $presets = $this->_privateConfig->fetch->preset->toArray();
+        }
+
+        $exceptedProperties = array();
+        if (isset($this->_privateConfig->fetch->default->exception)) {
+            $exceptedProperties = $this->_privateConfig->fetch->default->exception->toArray();
+        }
+
         try {
             $res = self::import(
                 $this->_graphUri,
@@ -747,22 +757,15 @@ public function importAction()
                 $this->_getProxyUri($uri),
                 isset($this->_privateConfig->fetch->allData)
                 && ((boolean)$this->_privateConfig->fetch->allData === true),
-                !isset($this->_privateConfig->fetch->preset)
-                ?
-                array()
-                :
-                $this->_privateConfig->fetch->preset->toArray(),
-                !isset($this->_privateConfig->fetch->default->exception)
-                ?
-                array()
-                :
-                $this->_privateConfig->fetch->default->exception->toArray(),
+                $presets,
+                $exceptedProperties,
                 $wrapperName,
                 $this->_privateConfig->fetch->default->mode
             );
         } catch (Exception $e) {
             if (defined('_EFDEBUG')) {
-                return $this->_sendResponse(false, 'An error occured: ' . $e->getMessage(), OntoWiki_Message::ERROR);
+                $errorMessage = 'An error occured: ' . $e->getMessage() . " – " . $e->getTraceAsString();
+                return $this->_sendResponse(false, $errorMessage, OntoWiki_Message::ERROR);
             } else {
                 $res = null;
             }
diff --git a/extensions/datagathering/DatagatheringHelper.php b/extensions/datagathering/DatagatheringHelper.php
index cc85d7d64..5e2e3b687 100644
--- a/extensions/datagathering/DatagatheringHelper.php
+++ b/extensions/datagathering/DatagatheringHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/datagathering/DatagatheringPlugin.php b/extensions/datagathering/DatagatheringPlugin.php
index 69109d2d6..847a7350c 100644
--- a/extensions/datagathering/DatagatheringPlugin.php
+++ b/extensions/datagathering/DatagatheringPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -57,7 +57,9 @@ class DatagatheringPlugin extends OntoWiki_Plugin
     public function init()
     {
         parent::init();
-        //$this->_properties   = $this->_privateConfig->properties->toArray();
+        if ($this->_privateConfig->sync->enabled && isset($this->_privateConfig->properties)) {
+            $this->_properties = $this->_privateConfig->properties->toArray();
+        }
         $this->_syncModelUri = $this->_privateConfig->syncModelUri;
 
         // Translation hack in order to enable the plugin to translate...
@@ -292,13 +294,13 @@ public function onPreTabsContentAction($event)
      */
     public function onDeleteResources($event)
     {
-        if ($this->_properties->sync->enabled) {
+        if ($this->_privateConfig->sync->enabled) {
             $modelUri = $event->modelUri;
             $uriArray = $event->resourceArray;
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s ?o');
+            $query->setSelectClause('SELECT ?s ?o');
             $query->addFrom($this->_syncModelUri);
             $query->setWherePart(
                 'WHERE {
@@ -337,12 +339,12 @@ public function onDeleteResources($event)
      */
     public function onPreDeleteModel($event)
     {
-        if ($this->_properties->sync->enabled) {
+        if ($this->_privateConfig->sync->enabled) {
             $modelUri = $event->modelUri;
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s');
+            $query->setSelectClause('SELECT ?s');
             $query->addFrom($this->_syncModelUri);
             $query->setWherePart(
                 'WHERE {
@@ -401,7 +403,7 @@ private function _getSyncConfig($uri, $wrapperName, $modelUri)
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s ?p ?o');
+            $query->setSelectClause('SELECT ?s ?p ?o');
             $query->addFrom($this->_syncModelUri);
             $where
                 = 'WHERE {
@@ -471,7 +473,7 @@ private function _listSyncConfigs()
 
             require_once 'Erfurt/Sparql/SimpleQuery.php';
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart('SELECT ?s ?p ?o');
+            $query->setSelectClause('SELECT ?s ?p ?o');
             $query->addFrom($this->_syncModelUri);
             $where
                 = 'WHERE {
diff --git a/extensions/datagathering/datagathering.js b/extensions/datagathering/datagathering.js
index 8c31a3a62..765b23545 100644
--- a/extensions/datagathering/datagathering.js
+++ b/extensions/datagathering/datagathering.js
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(document).ready(function()
 {
     // ------------------------------------------------------------------------
diff --git a/extensions/defaultmodel/DefaultmodelPlugin.php b/extensions/defaultmodel/DefaultmodelPlugin.php
index effc5004e..44fb298b4 100644
--- a/extensions/defaultmodel/DefaultmodelPlugin.php
+++ b/extensions/defaultmodel/DefaultmodelPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/exconf/ExconfController.php b/extensions/exconf/ExconfController.php
index 215e34619..87510fd11 100644
--- a/extensions/exconf/ExconfController.php
+++ b/extensions/exconf/ExconfController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -236,9 +236,9 @@ public function confAction()
                     $ini->enabled = $this->_request->getParam('enabled') == "true";
                     $writer       = new Zend_Config_Writer_Ini(array());
                     $writer->write($localIniPath, $ini, true);
-                    
+
                     //invalidate the cache to get changes distributed
-                    $cache	= OntoWiki::getInstance()->getCache();
+                    $cache = OntoWiki::getInstance()->getCache();
                     $cache->remove('ow_extensionConfig');
                 }
                 // the conf action sends a complete config array as json
@@ -263,9 +263,9 @@ public function confAction()
                         OntoWiki::getInstance()->appendMessage(
                             new OntoWiki_Message('config sucessfully changed', OntoWiki_Message::SUCCESS)
                         );
-                        
-                        //invalidate the cache to get changes distributed
-                        $cache	= OntoWiki::getInstance()->getCache();
+
+                        //invalidate the cache to get changes distributed
+                        $cache = OntoWiki::getInstance()->getCache();
                         $cache->remove('ow_extensionConfig');
                     }
                     $this->_redirect($this->urlBase . 'exconf/conf/?name=' . $name);
diff --git a/extensions/exconf/ExconfHelper.php b/extensions/exconf/ExconfHelper.php
index 5be85766a..e56b90d1f 100644
--- a/extensions/exconf/ExconfHelper.php
+++ b/extensions/exconf/ExconfHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/exconf/OutlineModule.php b/extensions/exconf/OutlineModule.php
index 9f7a65065..54e80a13e 100644
--- a/extensions/exconf/OutlineModule.php
+++ b/extensions/exconf/OutlineModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/exconf/resources/exconf.css b/extensions/exconf/resources/exconf.css
index e493e90c8..298ce6056 100644
--- a/extensions/exconf/resources/exconf.css
+++ b/extensions/exconf/resources/exconf.css
@@ -1,11 +1,10 @@
-/* 
-    Document   : exconf
-    Created on : 03.02.2011, 19:29:44
-    Author     : haschek
-    Description:
-        defines special elements for the extension configurator
-*/
-
+/**
+ * Defines special elements for the extension configurator
+ * @author    haschek
+ * @since     03.02.2011, 19:29:44
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 #show_extension input, legend
 {
     position:absolute;
diff --git a/extensions/exconf/resources/exconf.js b/extensions/exconf/resources/exconf.js
index 6f3f5f4ad..249b1fcb1 100644
--- a/extensions/exconf/resources/exconf.js
+++ b/extensions/exconf/resources/exconf.js
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(function()
 {
 
diff --git a/extensions/exconf/resources/outline.js b/extensions/exconf/resources/outline.js
index 92e764370..5b39025b8 100644
--- a/extensions/exconf/resources/outline.js
+++ b/extensions/exconf/resources/outline.js
@@ -1,15 +1,19 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(document).ready(function() {
     extensionOutline();
 });
 
 function extensionOutline() {
-    target=$('div.outline').empty();
-    target=target.append('<ol class="bullets-none separated" />').children('ol');
-    
+    var target = $('div.outline').empty();
+    target = target.append('<ol class="bullets-none separated" />').children('ol');
+
     var even = true;
     $('div.extension:visible').each(function(){
-        title=$(this).find('.name').text();
-        id=$(this).attr('id');
+        var title = $(this).find('.name').text();
+        var id = $(this).attr('id');
         if(even){
             target.append('<li><a title="' +title+ '" href="#' +id+ '">' +title+ '</a></li>');
         } else {
diff --git a/extensions/exconf/resources/togglebutton.css b/extensions/exconf/resources/togglebutton.css
index ddc072a98..f349f8dd8 100644
--- a/extensions/exconf/resources/togglebutton.css
+++ b/extensions/exconf/resources/togglebutton.css
@@ -1,11 +1,10 @@
-/*
-    Document   : togglebutton
-    Created on : 21.08.205, 21:39:53
-    Author     : jonas
-    Description:
-        style for the jquery.togglebutton plugin
-*/
-
+/**
+ * Style for the jquery.togglebutton plugin.
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @author    jonas
+ * @since     21.08.205, 21:39:53
+ */
 .togglebutton {
     border: none;
     background: transparent;
diff --git a/extensions/filter/CustomfilterModule.php b/extensions/filter/CustomfilterModule.php
index cddda60e4..bfa317154 100644
--- a/extensions/filter/CustomfilterModule.php
+++ b/extensions/filter/CustomfilterModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/filter/FilterController.php b/extensions/filter/FilterController.php
index 6cb28c34e..9bc856c5e 100644
--- a/extensions/filter/FilterController.php
+++ b/extensions/filter/FilterController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/filter/FilterModule.php b/extensions/filter/FilterModule.php
index 56f5be9e0..3b9c6f3ac 100644
--- a/extensions/filter/FilterModule.php
+++ b/extensions/filter/FilterModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -94,8 +94,12 @@ public function getMenu()
         $edit->setEntry('Add', 'javascript:showAddFilterBox()')
             ->setEntry('Remove all', 'javascript:removeAllFilters()');
 
+        $help = new OntoWiki_Menu();
+        $help->setEntry('Toggle help', 'javascript:toggleHelp()');
+
         $main = new OntoWiki_Menu();
         $main->setEntry('Edit', $edit);
+        $main->setEntry('Help', $help);
 
         return $main;
     }
diff --git a/extensions/filter/resources/FilterAPI.js b/extensions/filter/resources/FilterAPI.js
index 93306eb78..cd070345e 100644
--- a/extensions/filter/resources/FilterAPI.js
+++ b/extensions/filter/resources/FilterAPI.js
@@ -1,162 +1,163 @@
 /**
  * @class
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 function FilterAPI(){
-	/*
-         * @var
-         */
-        this.uri = reloadUrl;
-        /*
-         *@var array
-         */
-        this.callbacks = new Array();
-
-        /**
-         * @var array
-         */
-        this.filters = filtersFromSession;
-        
-        /**
-         * @var int
-         */
-        this.count = 0;
-        for(onefilter in filtersFromSession){
-            this.count++;
-        }
 
+    /*
+     * @var
+     */
+
+    this.uri = reloadUrl;
+    /*
+     *@var array
+     */
+
+    this.callbacks = new Array();
+    /**
+     * @var array
+     */
+    this.filters = filtersFromSession;
+
+    /**
+     * @var int
+     */
+    this.count = 0;
+    for(onefilter in filtersFromSession){
+        this.count++;
+    }
+
+    /**
+     *@method
+     *
+     */
+    this.addCallback = function(callback){
+        if(typeof callback == 'function' || typeof callback == 'object')
+            this.callbacks.push(callback);
+    };
+
+    /**
+     *@method
+     *
+     */
+    this.removeAllFiltersOfProperty = function(uri){
+        var data = { filter: [] }
+        for(afilterName in this.filters){
+            if(this.filters[afilterName].property == uri){
+                data.filter.push({
+                    "mode" : "box",
+                    "action" : "remove",
+                    "id" : this.filters[afilterName].id
+                })
+            }
+        }
+        var dataserialized = $.toJSON(data);
+        var url = this.uri + "?instancesconfig=" + encodeURIComponent(dataserialized)+"&list="+listName;
+        //alert(dataserialized)
+        window.location = url;
+    };
+
+    /**
+     * add a filter
+     * @method
+     * @param id int,string
+     * @param property string an iri (predicate) which values should be filtered
+     * @param isInverse boolean if the property is inverse
+     * @param propertyLabel string a label for the property (will be displayed instead)
+     * @param filter string can be "contains" or "equals" . going to be enhanced
+     * @param value1 mixed the value applied to the filter
+     * @param value2 mixed the value applied to the filter. often optional (used for "between")
+     * @param valuetype string may be "uri" or "literal" or "typedliteral" or "langtaggedliteral"
+     * @param literaltype string if valuetype is "typedliteral" or "langtaggedliteral": you can put stuff like "de" or "xsd:int" here...
+     * @param callback function will be called on success
+     * @param hidden boolean will not show up in filterbox if true
+     * @param negate 
+     * @param dontReload prevent page reloading
+     */
+    this.add = function(id, property, isInverse, propertyLabel, filter, value1, value2, valuetype, literaltype, callback, hidden, negate, dontReload){
+        if(typeof callback != 'function' && typeof callback != 'object'){
+            callback = function(){};
+        }
 
-        /**
-         *@method
-         *
-         */
-	this.addCallback = function(callback){
-		if(typeof callback == 'function' || typeof callback == 'object')
-			this.callbacks.push(callback);
-	};
-        
-        /**
-         *@method
-         *
-         */
-	this.removeAllFiltersOfProperty = function(uri){
-            var data = { filter: [] }
-            for(afilterName in this.filters){
-                if(this.filters[afilterName].property == uri){
-                    data.filter.push({
+        if(id == null){
+            id  = "filterbox"+this.count
+        }
+        var data =
+            {
+            filter:
+                [
+                    {
                         "mode" : "box",
-                        "action" : "remove",
-                        "id" : this.filters[afilterName].id
-                    })
-                }
-            }
-            var dataserialized = $.toJSON(data);
-            var url = this.uri + "?instancesconfig=" + encodeURIComponent(dataserialized)+"&list="+listName;
-            //alert(dataserialized)
-            window.location = url;
+                        "action" : "add",
+                        "id" : id,
+                        "property" : property,
+                        "isInverse" : typeof isInverse != 'undefined' ? isInverse : false,
+                        "propertyLabel" : typeof propertyLabel != 'undefined' ? propertyLabel : null,
+                        "filter" : filter,
+                        "value1": value1,
+                        "value2": typeof value2 != 'undefined' ? value2 : null,
+                        "valuetype": typeof valuetype != 'undefined' ? valuetype : null,
+                        "literaltype" : typeof literaltype != 'undefined' ? literaltype : null,
+                        "hidden" : typeof hidden != 'undefined' ? hidden : false,
+                        "negate" : typeof negate != 'undefined' ? negate : false
+                    }
+                ]
         };
 
-	/**
-         * add a filter
-         * @method
-         * @param id int,string
-         * @param property string an iri (predicate) which values should be filtered
-         * @param isInverse boolean if the property is inverse
-         * @param propertyLabel string a label for the property (will be displayed instead)
-         * @param filter string can be "contains" or "equals" . going to be enhanced
-         * @param value1 mixed the value applied to the filter
-         * @param value2 mixed the value applied to the filter. often optional (used for "between")
-         * @param valuetype string may be "uri" or "literal" or "typedliteral" or "langtaggedliteral"
-         * @param literaltype string if valuetype is "typedliteral" or "langtaggedliteral": you can put stuff like "de" or "xsd:int" here...
-         * @param callback function will be called on success
-         * @param hidden boolean will not show up in filterbox if true
-         * @param negate 
-         * @param dontReload prevent page reloading
-         */
-	this.add = function(id, property, isInverse, propertyLabel, filter, value1, value2, valuetype, literaltype, callback, hidden, negate, dontReload){
-            if(typeof callback != 'function' && typeof callback != 'object'){
-		callback = function(){};
-            }
+        var dataserialized = $.toJSON(data);
+        var url = this.uri + "?instancesconfig=" + encodeURIComponent(dataserialized)+"&list="+listName;
 
-            if(id == null){
-                id  = "filterbox"+this.count
-            }
-            var data =
-                {
-                filter:
-                    [
-                        {
-                            "mode" : "box",
-                            "action" : "add",
-                            "id" : id,
-                            "property" : property,
-                            "isInverse" : typeof isInverse != 'undefined' ? isInverse : false,
-                            "propertyLabel" : typeof propertyLabel != 'undefined' ? propertyLabel : null,
-                            "filter" : filter,
-                            "value1": value1,
-                            "value2": typeof value2 != 'undefined' ? value2 : null,
-                            "valuetype": typeof valuetype != 'undefined' ? valuetype : null,
-                            "literaltype" : typeof literaltype != 'undefined' ? literaltype : null,
-                            "hidden" : typeof hidden != 'undefined' ? hidden : false,
-                            "negate" : typeof negate != 'undefined' ? negate : false
-                        }
-                    ]
-            };
-
-            var dataserialized = $.toJSON(data);
-            var url = this.uri + "?instancesconfig=" + encodeURIComponent(dataserialized)+"&list="+listName;
-            
-            this.count++;
-            
-            if(dontReload == true){
-                $.ajax(
-                  {
-                      "url": url,
-                      "type" : "POST"
-                  }
-                );
-            } else {
-                window.location = url;
-            }
-	};
+        this.count++;
 
-	this.reloadInstances = function(){
-            //$('.content .innercontent').load(document.URL);
-            //window.location = this.uri;
-	};
-
-        this.filterExists = function(id){
-            return (typeof this.filters[id] != 'undefined');
+        if(dontReload == true){
+            $.ajax(
+              {
+                  "url": url,
+                  "type" : "POST"
+              }
+            );
+        } else {
+            window.location = url;
         }
+    };
 
-        this.getFilterById = function(id){
-            return this.filters[id];
-        }
+    this.reloadInstances = function(){
+        //$('.content .innercontent').load(document.URL);
+        //window.location = this.uri;
+    };
 
+    this.filterExists = function(id){
+        return (typeof this.filters[id] != 'undefined');
+    }
 
-	this.remove = function(id, callback){
-            if(typeof callback != 'function' && typeof callback != 'object')
-                callback = function(){};
+    this.getFilterById = function(id){
+        return this.filters[id];
+    }
 
-            var data = {
-                filter: [
-                    {
-                        "action" : "remove",
-                        "id" : id
-                    }
-                ]
-            };
+    this.remove = function(id, callback){
+        if(typeof callback != 'function' && typeof callback != 'object')
+            callback = function(){};
+
+        var data = {
+            filter: [
+                {
+                    "action" : "remove",
+                    "id" : id
+                }
+            ]
+        };
 
-            var dataserialized = $.toJSON(data);
+        var dataserialized = $.toJSON(data);
 
-            this.count--;
-            
-            window.location = this.uri + "?instancesconfig=" + encodeURIComponent(dataserialized);
-	};
+        this.count--;
+        window.location = this.uri + "?instancesconfig=" + encodeURIComponent(dataserialized);
+    };
 
-	this.removeAll = function(){
-            this.count = 0;
-            window.location = this.uri+"?init"
-	};
+    this.removeAll = function(){
+        this.count = 0;
+        window.location = this.uri+"?init"
+    };
 }
 
 var filter = new FilterAPI();
\ No newline at end of file
diff --git a/extensions/filter/resources/filter.css b/extensions/filter/resources/filter.css
index d3c998ba6..6cd9e9adf 100644
--- a/extensions/filter/resources/filter.css
+++ b/extensions/filter/resources/filter.css
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 #cancelrestrictionbutton {
 	color: red;
 }
diff --git a/extensions/filter/resources/filter.js b/extensions/filter/resources/filter.js
index 210b72cfd..48db7c2f2 100644
--- a/extensions/filter/resources/filter.js
+++ b/extensions/filter/resources/filter.js
@@ -1,24 +1,29 @@
+/*
+ * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
 var filterboxcounter = 0; // dont overwrite previous filters
 
 function showAddFilterBox(){
     // $("#addFilterWindowOverlay").show();
     $("#addFilterWindowOverlay").modal({
         overlay: 80,
-        overlayCss: {backgroundColor: '#000'}, 
+        overlayCss: {backgroundColor: '#000'},
         overlayClose: true, 
         onOpen: function (dialog) {
-        	dialog.overlay.fadeIn(effectTime, function () {
+            dialog.overlay.fadeIn(effectTime, function () {
                 dialog.data.show();
-        		dialog.container.fadeIn(effectTime);
-        	})
-    	}, 
-    	onClose: function (dialog) {
-    	    dialog.container.fadeOut(effectTime, function() {
-    	        dialog.overlay.fadeOut(effectTime, function() {
-    	            $.modal.close();
-    	        });
-    	    });
-    	}
+                dialog.container.fadeIn(effectTime);
+            })
+        },
+        onClose: function (dialog) {
+            dialog.container.fadeOut(effectTime, function() {
+                dialog.overlay.fadeOut(effectTime, function() {
+                    $.modal.close();
+                });
+            });
+        }
     });
 }
 function updatePossibleValues() {
@@ -40,6 +45,10 @@ function removeAllFilters(){
     });
 }
 
+function toggleHelp(){
+    $("#helptext").slideToggle();
+}
+
 $(document).ready(function(){
     //initial layout
     $("#gqbclassrestrictionsexist").hide();
@@ -86,7 +95,7 @@ $(document).ready(function(){
 
         var type = "literal";
         var typedata = null;
-        
+
         // if value entering is possible but nothing entered: check if user selected something in the possible values box
         if(value1 == "" && $("#valueboxes").children().length == 1){
             if($("#addwindow #possiblevalues option:selected").length == 0){
@@ -113,7 +122,7 @@ $(document).ready(function(){
 
     //show possible values for select property
     $("#property").change(updatePossibleValues);
-    
+
     //different filter types need different value input fields
     // bound: none
     // contains, larger, smaller: one
@@ -140,7 +149,7 @@ $(document).ready(function(){
           }
       }
     });
-    
+
     //$.dump(filter);
     //register the filter box for (other) filter events
     //filter.addCallback(function(newfilter){ showFilter() });
diff --git a/extensions/filter/resources/jquery.dump.js b/extensions/filter/resources/jquery.dump.js
index 43a05a4e7..851ab6cf5 100644
--- a/extensions/filter/resources/jquery.dump.js
+++ b/extensions/filter/resources/jquery.dump.js
@@ -1,301 +1,305 @@
+/**
+ * @copyright   Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license     http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 jQuery.fn.dump = function(showTypes, showAttributes) {
-	jQuery.dump($(this), showTypes, showAttributes);
-	return this;
+    jQuery.dump($(this), showTypes, showAttributes);
+    return this;
 };
 
 jQuery.dump = function(object, showTypes, showAttributes) {
-  var dump = '';
-  var st = typeof showTypes == 'undefined' ? true : showTypes;
-  var sa = typeof showAttributes == 'undefined' ? true : showAttributes;  
-  var winName = 'dumpWin';
-  var w = 760;
-  var h = 500;
-  var leftPos = screen.width ? (screen.width - w) / 2 : 0;
-  var topPos = screen.height ? (screen.height - h) / 2 : 0;
-  var settings = 'height=' + h + ',width=' + w + ',top=' + topPos + ',left=' + leftPos + ',scrollbars=yes,menubar=yes,status=yes,resizable=yes';
-  var title = 'Dump';
-  var script = 'function tRow(s) {t = s.parentNode.lastChild;tTarget(t, tSource(s)) ;}function tTable(s) {var switchToState = tSource(s) ;var table = s.parentNode.parentNode;for (var i = 1; i < table.childNodes.length; i++) {t = table.childNodes[i] ;if (t.style) {tTarget(t, switchToState);}}}function tSource(s) {if (s.style.fontStyle == "italic" || s.style.fontStyle == null) {s.style.fontStyle = "normal";s.title = "click to collapse";return "open";} else {s.style.fontStyle = "italic";s.title = "click to expand";return "closed" ;}}function tTarget (t, switchToState) {if (switchToState == "open") {t.style.display = "";} else {t.style.display = "none";}}';	
-  
- var _recurse = function (o, type) {
-    var i;
-	var j = 0;
-	var r = '';
-	type = _dumpType(o);
-	switch (type) {		
-	  case 'regexp':
-	    var t = type;
-	    r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
-	    r += '<tr><td colspan="2"' + _dumpStyles(t,'td-value') + '><table' + _dumpStyles('arguments','table') + '><tr><td' + _dumpStyles('arguments','td-key') + '><i>RegExp: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o + '</td></tr></table>';  
-	    j++;
-	    break;
-	  case 'date':
-	    var t = type;
-	    r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
-	    r += '<tr><td colspan="2"' + _dumpStyles(t,'td-value') + '><table' + _dumpStyles('arguments','table') + '><tr><td' + _dumpStyles('arguments','td-key') + '><i>Date: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o + '</td></tr></table>';  
-	    j++;
-	    break;
-	  case 'function':
-	    var t = type;
-	    var a = o.toString().match(/^.*function.*?\((.*?)\)/im); 
-	    var args = (a == null || typeof a[1] == 'undefined' || a[1] == '') ? 'none' : a[1];
-	    r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
-	    r += '<tr><td colspan="2"' + _dumpStyles(t,'td-value') + '><table' + _dumpStyles('arguments','table') + '><tr><td' + _dumpStyles('arguments','td-key') + '><i>Arguments: </i></td><td' + _dumpStyles(type,'td-value') + '>' + args + '</td></tr><tr><td' + _dumpStyles('arguments','td-key') + '><i>Function: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o + '</td></tr></table>';  
-	    j++;
-	    break;
-	  case 'domelement':
-	    var t = type;
-		var attr = '';
-		if (sa) {
-		  for (i in o) {if (!/innerHTML|outerHTML/i.test(i)) {attr += i + ': ' + o[i] + '<br />';}}
-		}
-	    r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
-	    r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Node Name: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.nodeName.toLowerCase() + '</td></tr>';  
-		r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Node Type: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.nodeType + '</td></tr>'; 
-		r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Node Value: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.nodeValue + '</td></tr>';
-		if (sa) {
-		  r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Attributes: </i></td><td' + _dumpStyles(type,'td-value') + '>' + attr + '</td></tr>';  		
-		  r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>innerHTML: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.innerHTML + '</td></tr>'; 
-		  if (typeof o.outerHTML != 'undefined') {
-		    r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>outerHTML: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.outerHTML + '</td></tr>'; 
-		  }
-		}
-	    j++;
-	    break;		
-	}
-	if (/object|array/.test(type)) {
-      for (i in o) {
-	    var t = _dumpType(o[i]);
-	    if (j < 1) {
-	      r += '<table' + _dumpStyles(type,'table') + '><tr><th colspan="2"' + _dumpStyles(type,'th') + '>' + type + '</th></tr>';
-		  j++;	  
-	    }
-	    if (typeof o[i] == 'object' && o[i] != null) { 
-		  r += '<tr><td' + _dumpStyles(type,'td-key') + '>' + i + (st ? ' [' + t + ']' : '') + '</td><td' + _dumpStyles(type,'td-value') + '>' + _recurse(o[i], t) + '</td></tr>';	
-	    } else if (typeof o[i] == 'function') {
-		  r += '<tr><td' + _dumpStyles(type ,'td-key') + '>' + i + (st ? ' [' + t + ']' : '') + '</td><td' + _dumpStyles(type,'td-value') + '>' + _recurse(o[i], t) + '</td></tr>';  	
-		} else {
-		  r += '<tr><td' + _dumpStyles(type,'td-key') + '>' + i + (st ? ' [' + t + ']' : '') + '</td><td' + _dumpStyles(type,'td-value') + '>' + o[i] + '</td></tr>';  
-	    }
-	  }
-	}
-	if (j == 0) {
-	  r += '<table' + _dumpStyles(type,'table') + '><tr><th colspan="2"' + _dumpStyles(type,'th') + '>' + type + ' [empty]</th></tr>'; 	
-	}
-	r += '</table>';
-	return r;
-  };	
-  var _dumpStyles = function(type, use) {
-  var r = '';
-  var table = 'font-size:xx-small;font-family:verdana,arial,helvetica,sans-serif;cell-spacing:2px;';
-  var th = 'font-size:xx-small;font-family:verdana,arial,helvetica,sans-serif;text-align:left;color: white;padding: 5px;vertical-align :top;cursor:hand;cursor:pointer;';
-  var td = 'font-size:xx-small;font-family:verdana,arial,helvetica,sans-serif;vertical-align:top;padding:3px;';
-  var thScript = 'onClick="tTable(this);" title="click to collapse"';
-  var tdScript = 'onClick="tRow(this);" title="click to collapse"';
-  switch (type) {
-	case 'string':
-	case 'number':
-	case 'boolean':
-	case 'undefined':
-	case 'object':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#0000cc;"';
-		  break;
-		case 'th':
-		  r = ' style="' + th + 'background-color:#4444cc;"' + thScript;
-		  break;
-		case 'td-key':
-		  r = ' style="' + td + 'background-color:#ccddff;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;
-		case 'td-value':
-		  r = ' style="' + td + 'background-color:#fff;"';
-		  break;
-	  }
-	  break;
-	case 'array':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#006600;"';
-		  break;
-		case 'th':
-		  r = ' style="' + th + 'background-color:#009900;"' + thScript;
-		  break;
-		case 'td-key':
-		  r = ' style="' + td + 'background-color:#ccffcc;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;
-		case 'td-value':
-		  r = ' style="' + td + 'background-color:#fff;"';
-		  break;
-	  }	
-	  break;
-	case 'function':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#aa4400;"';
-		  break;
-		case 'th':
-		  r = ' style="' + th + 'background-color:#cc6600;"' + thScript;
-		  break;
-		case 'td-key':
-		  r = ' style="' + td + 'background-color:#fff;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;
-		case 'td-value':
-		  r = ' style="' + td + 'background-color:#fff;"';
-		  break;
-	  }	
-	  break;
-	case 'arguments':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#dddddd;cell-spacing:3;"';
-		  break;
-		case 'td-key':
-		  r = ' style="' + th + 'background-color:#eeeeee;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;	  
-	  }	
-	  break;
-	case 'regexp':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#CC0000;cell-spacing:3;"';
-		  break;
-		case 'th':
-		  r = ' style="' + th + 'background-color:#FF0000;"' + thScript;
-		  break;
-		case 'td-key':
-		  r = ' style="' + th + 'background-color:#FF5757;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;
-		case 'td-value':
-		  r = ' style="' + td + 'background-color:#fff;"';
-		  break;		  
-	  }	
-	  break;
-	case 'date':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#663399;cell-spacing:3;"';
-		  break;
-		case 'th':
-		  r = ' style="' + th + 'background-color:#9966CC;"' + thScript;
-		  break;
-		case 'td-key':
-		  r = ' style="' + th + 'background-color:#B266FF;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;
-		case 'td-value':
-		  r = ' style="' + td + 'background-color:#fff;"';
-		  break;		  
-	  }	
-	  break;
-	case 'domelement':
-	case 'document':
-	case 'window':
-	  switch (use) {
-		case 'table':  
-		  r = ' style="' + table + 'background-color:#FFCC33;cell-spacing:3;"';
-		  break;
-		case 'th':
-		  r = ' style="' + th + 'background-color:#FFD966;"' + thScript;
-		  break;
-		case 'td-key':
-		  r = ' style="' + th + 'background-color:#FFF2CC;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
-		  break;
-		case 'td-value':
-		  r = ' style="' + td + 'background-color:#fff;"';
-		  break;		  
-	  }	
-	  break;	  
-  }
-  return r;
-  };
-  var _dumpType = function (obj) {
-    var t = typeof(obj);
-    if (t == 'function') {
-      var f = obj.toString();
-      if ( ( /^\/.*\/[gi]??[gi]??$/ ).test(f)) {
-        return 'regexp';
-      } else if ((/^\[object.*\]$/i ).test(f)) {
-        t = 'object'
-      }
-    }
-    if (t != 'object') {
-      return t;
-    }
-    switch (obj) {
-      case null:
-        return 'null';
-      case window:
-        return 'window';
-	  case document:
-	    return 'document';
-      case window.event:
-        return 'event';
-    }
-    if (window.event && (event.type == obj.type)) {
-      return 'event';
-    }
-    var c = obj.constructor;
-    if (c != null) {
-      switch(c) {
-        case Array:
-          t = 'array';
-          break;
-        case Date:
-          return 'date';
-        case RegExp:
-          return 'regexp';
-        case Object:
-          t = 'object';	
-        break;
-        case ReferenceError:
-          return 'error';
-        default:
-          var sc = c.toString();
-          var m = sc.match(/\s*function (.*)\(/);
-          if (m != null) {
-            return 'object';
-          }
-      }
-    }
-    var nt = obj.nodeType;
-    if (nt != null) {
-      switch(nt) {
-        case 1:
-          return 'domelement';
-        case 3:
-          return 'string';
-      }
+    var dump = '';
+    var st = typeof showTypes == 'undefined' ? true : showTypes;
+    var sa = typeof showAttributes == 'undefined' ? true : showAttributes;
+    var winName = 'dumpWin';
+    var w = 760;
+    var h = 500;
+    var leftPos = screen.width ? (screen.width - w) / 2 : 0;
+    var topPos = screen.height ? (screen.height - h) / 2 : 0;
+    var settings = 'height=' + h + ',width=' + w + ',top=' + topPos + ',left=' + leftPos + ',scrollbars=yes,menubar=yes,status=yes,resizable=yes';
+    var title = 'Dump';
+    var script = 'function tRow(s) {t = s.parentNode.lastChild;tTarget(t, tSource(s)) ;}function tTable(s) {var switchToState = tSource(s) ;var table = s.parentNode.parentNode;for (var i = 1; i < table.childNodes.length; i++) {t = table.childNodes[i] ;if (t.style) {tTarget(t, switchToState);}}}function tSource(s) {if (s.style.fontStyle == "italic" || s.style.fontStyle == null) {s.style.fontStyle = "normal";s.title = "click to collapse";return "open";} else {s.style.fontStyle = "italic";s.title = "click to expand";return "closed" ;}}function tTarget (t, switchToState) {if (switchToState == "open") {t.style.display = "";} else {t.style.display = "none";}}';        
+
+    var _recurse = function (o, type) {
+        var i;
+        var j = 0;
+        var r = '';
+        type = _dumpType(o);
+        switch (type) {
+            case 'regexp':
+                var t = type;
+                r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
+                r += '<tr><td colspan="2"' + _dumpStyles(t,'td-value') + '><table' + _dumpStyles('arguments','table') + '><tr><td' + _dumpStyles('arguments','td-key') + '><i>RegExp: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o + '</td></tr></table>';    
+                j++;
+                break;
+            case 'date':
+                var t = type;
+                r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
+                r += '<tr><td colspan="2"' + _dumpStyles(t,'td-value') + '><table' + _dumpStyles('arguments','table') + '><tr><td' + _dumpStyles('arguments','td-key') + '><i>Date: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o + '</td></tr></table>';    
+                j++;
+                break;
+            case 'function':
+                var t = type;
+                var a = o.toString().match(/^.*function.*?\((.*?)\)/im); 
+                var args = (a == null || typeof a[1] == 'undefined' || a[1] == '') ? 'none' : a[1];
+                r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
+                r += '<tr><td colspan="2"' + _dumpStyles(t,'td-value') + '><table' + _dumpStyles('arguments','table') + '><tr><td' + _dumpStyles('arguments','td-key') + '><i>Arguments: </i></td><td' + _dumpStyles(type,'td-value') + '>' + args + '</td></tr><tr><td' + _dumpStyles('arguments','td-key') + '><i>Function: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o + '</td></tr></table>';    
+                j++;
+                break;
+            case 'domelement':
+                var t = type;
+                var attr = '';
+                if (sa) {
+                    for (i in o) {if (!/innerHTML|outerHTML/i.test(i)) {attr += i + ': ' + o[i] + '<br />';}}
+                }
+                r += '<table' + _dumpStyles(t,'table') + '><tr><th colspan="2"' + _dumpStyles(t,'th') + '>' + t + '</th></tr>';
+                r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Node Name: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.nodeName.toLowerCase() + '</td></tr>';    
+                r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Node Type: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.nodeType + '</td></tr>'; 
+                r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Node Value: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.nodeValue + '</td></tr>';
+                if (sa) {
+                    r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>Attributes: </i></td><td' + _dumpStyles(type,'td-value') + '>' + attr + '</td></tr>';                    
+                    r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>innerHTML: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.innerHTML + '</td></tr>'; 
+                    if (typeof o.outerHTML != 'undefined') {
+                        r += '<tr><td' + _dumpStyles(t,'td-key') + '><i>outerHTML: </i></td><td' + _dumpStyles(type,'td-value') + '>' + o.outerHTML + '</td></tr>'; 
+                    }
+                }
+                j++;
+                break;
+        }
+        if (/object|array/.test(type)) {
+            for (i in o) {
+                var t = _dumpType(o[i]);
+                if (j < 1) {
+                    r += '<table' + _dumpStyles(type,'table') + '><tr><th colspan="2"' + _dumpStyles(type,'th') + '>' + type + '</th></tr>';
+                    j++;
+                }
+                if (typeof o[i] == 'object' && o[i] != null) { 
+                    r += '<tr><td' + _dumpStyles(type,'td-key') + '>' + i + (st ? ' [' + t + ']' : '') + '</td><td' + _dumpStyles(type,'td-value') + '>' + _recurse(o[i], t) + '</td></tr>';        
+                } else if (typeof o[i] == 'function') {
+                    r += '<tr><td' + _dumpStyles(type ,'td-key') + '>' + i + (st ? ' [' + t + ']' : '') + '</td><td' + _dumpStyles(type,'td-value') + '>' + _recurse(o[i], t) + '</td></tr>';            
+                } else {
+                    r += '<tr><td' + _dumpStyles(type,'td-key') + '>' + i + (st ? ' [' + t + ']' : '') + '</td><td' + _dumpStyles(type,'td-value') + '>' + o[i] + '</td></tr>';    
+                }
+            }
+        }
+        if (j == 0) {
+            r += '<table' + _dumpStyles(type,'table') + '><tr><th colspan="2"' + _dumpStyles(type,'th') + '>' + type + ' [empty]</th></tr>';         
+        }
+        r += '</table>';
+        return r;
+    };
+    var _dumpStyles = function(type, use) {
+    var r = '';
+    var table = 'font-size:xx-small;font-family:verdana,arial,helvetica,sans-serif;cell-spacing:2px;';
+    var th = 'font-size:xx-small;font-family:verdana,arial,helvetica,sans-serif;text-align:left;color: white;padding: 5px;vertical-align :top;cursor:hand;cursor:pointer;';
+    var td = 'font-size:xx-small;font-family:verdana,arial,helvetica,sans-serif;vertical-align:top;padding:3px;';
+    var thScript = 'onClick="tTable(this);" title="click to collapse"';
+    var tdScript = 'onClick="tRow(this);" title="click to collapse"';
+    switch (type) {
+        case 'string':
+        case 'number':
+        case 'boolean':
+        case 'undefined':
+        case 'object':
+            switch (use) {
+                case 'table':    
+                    r = ' style="' + table + 'background-color:#0000cc;"';
+                    break;
+                case 'th':
+                    r = ' style="' + th + 'background-color:#4444cc;"' + thScript;
+                    break;
+                case 'td-key':
+                    r = ' style="' + td + 'background-color:#ccddff;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+                case 'td-value':
+                    r = ' style="' + td + 'background-color:#fff;"';
+                    break;
+            }
+            break;
+        case 'array':
+            switch (use) {
+                case 'table':    
+                    r = ' style="' + table + 'background-color:#006600;"';
+                    break;
+                case 'th':
+                    r = ' style="' + th + 'background-color:#009900;"' + thScript;
+                    break;
+                case 'td-key':
+                    r = ' style="' + td + 'background-color:#ccffcc;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+                case 'td-value':
+                    r = ' style="' + td + 'background-color:#fff;"';
+                    break;
+            }
+            break;
+        case 'function':
+            switch (use) {
+                case 'table':    
+                    r = ' style="' + table + 'background-color:#aa4400;"';
+                    break;
+                case 'th':
+                    r = ' style="' + th + 'background-color:#cc6600;"' + thScript;
+                    break;
+                case 'td-key':
+                    r = ' style="' + td + 'background-color:#fff;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+                case 'td-value':
+                    r = ' style="' + td + 'background-color:#fff;"';
+                    break;
+            }
+            break;
+        case 'arguments':
+            switch (use) {
+                case 'table':    
+                    r = ' style="' + table + 'background-color:#dddddd;cell-spacing:3;"';
+                    break;
+                case 'td-key':
+                    r = ' style="' + th + 'background-color:#eeeeee;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+            }
+            break;
+        case 'regexp':
+            switch (use) {
+                case 'table':
+                    r = ' style="' + table + 'background-color:#CC0000;cell-spacing:3;"';
+                    break;
+                case 'th':
+                    r = ' style="' + th + 'background-color:#FF0000;"' + thScript;
+                    break;
+                case 'td-key':
+                    r = ' style="' + th + 'background-color:#FF5757;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+                case 'td-value':
+                    r = ' style="' + td + 'background-color:#fff;"';
+                    break;
+            }
+            break;
+        case 'date':
+            switch (use) {
+                case 'table':
+                    r = ' style="' + table + 'background-color:#663399;cell-spacing:3;"';
+                    break;
+                case 'th':
+                    r = ' style="' + th + 'background-color:#9966CC;"' + thScript;
+                    break;
+                case 'td-key':
+                    r = ' style="' + th + 'background-color:#B266FF;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+                case 'td-value':
+                    r = ' style="' + td + 'background-color:#fff;"';
+                    break;
+            }        
+            break;
+        case 'domelement':
+        case 'document':
+        case 'window':
+            switch (use) {
+                case 'table':
+                    r = ' style="' + table + 'background-color:#FFCC33;cell-spacing:3;"';
+                    break;
+                case 'th':
+                    r = ' style="' + th + 'background-color:#FFD966;"' + thScript;
+                    break;
+                case 'td-key':
+                    r = ' style="' + th + 'background-color:#FFF2CC;color:#000000;cursor:hand;cursor:pointer;"' + tdScript;
+                    break;
+                case 'td-value':
+                    r = ' style="' + td + 'background-color:#fff;"';
+                    break;
+            }
+            break;
     }
-    if (obj.toString != null) {
-      var ex = obj.toString();
-      var am = ex.match(/^\[object (.*)\]$/i);
-      if (am != null) {
-        var am = am[1];
-        switch(am.toLowerCase()) {
-          case 'event':
+    return r;
+    };
+    var _dumpType = function (obj) {
+        var t = typeof(obj);
+        if (t == 'function') {
+            var f = obj.toString();
+            if ( ( /^\/.*\/[gi]??[gi]??$/ ).test(f)) {
+                return 'regexp';
+            } else if ((/^\[object.*\]$/i ).test(f)) {
+                t = 'object'
+            }
+        }
+        if (t != 'object') {
+            return t;
+        }
+        switch (obj) {
+            case null:
+                return 'null';
+            case window:
+                return 'window';
+            case document:
+                return 'document';
+            case window.event:
+                return 'event';
+        }
+        if (window.event && (event.type == obj.type)) {
             return 'event';
-          case 'nodelist':
-          case 'htmlcollection':
-          case 'elementarray':
-            return 'array';
-          case 'htmldocument':
-            return 'htmldocument';
         }
-      }
+        var c = obj.constructor;
+        if (c != null) {
+            switch(c) {
+                case Array:
+                    t = 'array';
+                    break;
+                case Date:
+                    return 'date';
+                case RegExp:
+                    return 'regexp';
+                case Object:
+                    t = 'object';
+                break;
+                case ReferenceError:
+                    return 'error';
+                default:
+                    var sc = c.toString();
+                    var m = sc.match(/\s*function (.*)\(/);
+                    if (m != null) {
+                        return 'object';
+                    }
+            }
+        }
+        var nt = obj.nodeType;
+        if (nt != null) {
+            switch(nt) {
+                case 1:
+                    return 'domelement';
+                case 3:
+                    return 'string';
+            }
+        }
+        if (obj.toString != null) {
+            var ex = obj.toString();
+            var am = ex.match(/^\[object (.*)\]$/i);
+            if (am != null) {
+                var am = am[1];
+                switch(am.toLowerCase()) {
+                    case 'event':
+                        return 'event';
+                    case 'nodelist':
+                    case 'htmlcollection':
+                    case 'elementarray':
+                        return 'array';
+                    case 'htmldocument':
+                        return 'htmldocument';
+                }
+            }
+        }
+        return t;
+    };    
+    dump += (/string|number|undefined|boolean/.test(typeof(object)) || object == null) ? object : _recurse(object, typeof object);
+    winName = window.open('', '', settings);
+    if (jQuery.browser.msie || jQuery.browser.browser == 'opera' || jQuery.browser.browser == 'safari') {
+        winName.document.write('<html><head><title> ' + title + ' </title><script type="text/javascript">' + script + '</script><head>');
+        winName.document.write('<body>' + dump + '</body></html>');
+    } else {
+        winName.document.body.innerHTML = dump;
+        winName.document.title = title;
+        var ffs = winName.document.createElement('script');
+        ffs.setAttribute('type', 'text/javascript');
+        ffs.appendChild(document.createTextNode(script));
+        winName.document.getElementsByTagName('head')[0].appendChild(ffs);
     }
-    return t;
-  };  
-  dump += (/string|number|undefined|boolean/.test(typeof(object)) || object == null) ? object : _recurse(object, typeof object);
-  winName = window.open('', '', settings);
-  if (jQuery.browser.msie || jQuery.browser.browser == 'opera' || jQuery.browser.browser == 'safari') {
-	winName.document.write('<html><head><title> ' + title + ' </title><script type="text/javascript">' + script + '</script><head>');
-	winName.document.write('<body>' + dump + '</body></html>');
-  } else {
-	winName.document.body.innerHTML = dump;
-	winName.document.title = title;
-	var ffs = winName.document.createElement('script');
-	ffs.setAttribute('type', 'text/javascript');
-	ffs.appendChild(document.createTextNode(script));
-	winName.document.getElementsByTagName('head')[0].appendChild(ffs);
-  }
-  winName.focus();  
+    winName.focus();
 };
\ No newline at end of file
diff --git a/extensions/filter/templates/filter/filter.phtml b/extensions/filter/templates/filter/filter.phtml
index 3b7008b12..79ce62862 100644
--- a/extensions/filter/templates/filter/filter.phtml
+++ b/extensions/filter/templates/filter/filter.phtml
@@ -3,20 +3,21 @@
  * OntoWiki filter module template
  */
 $odd = true;
+$translate = OntoWiki::getInstance()->translate;
 ?>
 <div id="filterbox">
     <!--ul id="list"></ul-->
     <form name="search" method="get" action="<?php echo $this->actionUrl ?>">
-	<p class="width98">
-		<label class="display-block" for="filtersearchtext-input"><?php echo $this->_('Search in list') ?></label>
-		<input class="text width99 inner-label" type="text" id="filtersearchtext-input" name="s" value="<?php echo $this->s ?>" />
-	</p>	
+    <p class="width98">
+        <label class="display-block" for="filtersearchtext-input"><?php echo $this->_('Search in list') ?></label>
+        <input class="text width99 inner-label" type="text" id="filtersearchtext-input" name="s" value="<?php echo $this->s ?>" />
+    </p>
     </form>
     <?php if ($this->filter) : ?>
     <?php $linkurl = new OntoWiki_Url(array('route' => 'properties'), array('r')) ?>
     <?php echo $this->_('Active Filters') ?>:
     <ul class="bullets-none separated">
-        <?php foreach ($this->filter as $filter) : 
+        <?php foreach ($this->filter as $filter) :
             if ( isset($filter['hidden'] ) && $filter['hidden'] ) {
                 continue;
             }
@@ -80,6 +81,16 @@ $odd = true;
         </li>
         <?php endforeach ?>
     </ul>
+    <div id="helptext" style="display: none;">
+    <h3><?= $translate->translate('Help') ?></h3>
+    <ul class="separated">
+       <li><?= $translate->translate('filter_help1'); ?></li>
+       <li><?= $translate->translate('filter_help2'); ?></li>
+       <li><?= $translate->translate('filter_help3'); ?></li>
+       <li><?= $translate->translate('filter_help4'); ?>
+       (<a href="http://docs.openlinksw.com/virtuoso/queryingftcols.html"><?= $translate->translate('Further info'); ?></a>)</li>
+    </ul>
+    </div>
     <?php endif ?>
 
    
diff --git a/extensions/googletracking/GoogletrackingPlugin.php b/extensions/googletracking/GoogletrackingPlugin.php
index 4a1815ea6..c77ec3f30 100644
--- a/extensions/googletracking/GoogletrackingPlugin.php
+++ b/extensions/googletracking/GoogletrackingPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/hideproperties/HidepropertiesPlugin.php b/extensions/hideproperties/HidepropertiesPlugin.php
index 48959f041..42b35f7b2 100644
--- a/extensions/hideproperties/HidepropertiesPlugin.php
+++ b/extensions/hideproperties/HidepropertiesPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -26,7 +26,7 @@ public function onPropertiesActionData($event)
 
             foreach ($data as $graphUri => $predicates) {
                 $query = new Erfurt_Sparql_SimpleQuery();
-                $query->setProloguePart('SELECT DISTINCT *')
+                $query->setSelectClause('SELECT DISTINCT *')
                     ->addFrom((string)$graphUri)
                     ->setWherePart('WHERE { ?p <' . $this->_privateConfig->hide->property . '> ?o . }');
 
diff --git a/extensions/history/HistoryController.php b/extensions/history/HistoryController.php
index d6080e385..b6ba05147 100644
--- a/extensions/history/HistoryController.php
+++ b/extensions/history/HistoryController.php
@@ -2,13 +2,13 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
  * History component controller.
- * 
+ *
  * @category   OntoWiki
  * @package    Extensions_History
  * @author     Christoph Rieß <c.riess.dev@googlemail.com>
@@ -65,8 +65,7 @@ public function feedAction()
                 $userArray[$entry['useruri']] = 'Anonymous';
             } elseif ($entry['useruri'] == $this->_erfurt->getConfig()->ac->user->superAdmin) {
                 $userArray[$entry['useruri']] = 'SuperAdmin';
-            } elseif (
-                is_array($userArray[$entry['useruri']]) &&
+            } elseif (is_array($userArray[$entry['useruri']]) &&
                 array_key_exists('userName', $userArray[$entry['useruri']])
             ) {
                 $userArray[$entry['useruri']] = $userArray[$entry['useruri']]['userName'];
@@ -198,9 +197,11 @@ public function listAction()
 
         // redirecting to home if no model/resource is selected
         if (empty($model)
-            || (empty($this->_owApp->selectedResource)
+            || (
+            empty($this->_owApp->selectedResource)
             && empty($params['r'])
-            && ($this->_owApp->lastRoute !== 'instances'))
+            && ($this->_owApp->lastRoute !== 'instances')
+            )
         ) {
             $this->_abort('No model/resource selected.', OntoWiki_Message::ERROR);
         }
@@ -224,9 +225,11 @@ public function listAction()
         // setting if class or instances
         if ($this->_owApp->lastRoute === 'instances') {
             // setting default title
-            $title = $resource->getTitle() ?
-                $resource->getTitle() :
-                OntoWiki_Utils::contractNamespace($resource->getIri());
+            if (!empty($resource->getTitle())) {
+                $title = $resource->getTitle();
+            } else {
+                $title = OntoWiki_Utils::contractNamespace($resource->getIri());
+            }
             $windowTitle = $translate->_('Versions for elements of the list');
 
             $listHelper = Zend_Controller_Action_HelperBroker::getStaticHelper('List');
@@ -264,9 +267,11 @@ public function listAction()
             $singleResource = false;
         } else {
             // setting default title
-            $title = $resource->getTitle() ?
-                $resource->getTitle() :
-                OntoWiki_Utils::contractNamespace($resource->getIri());
+            if (!empty($resource->getTitle())) {
+                $title = $resource->getTitle();
+            } else {
+                $title = OntoWiki_Utils::contractNamespace($resource->getIri());
+            }
             $windowTitle = sprintf($translate->_('Versions for %1$s'), $title);
 
             $historyArray = $versioning->getHistoryForResource(
@@ -373,7 +378,11 @@ public function rollbackAction()
         OntoWiki::getInstance()->getNavigation()->setActive('history');
 
         // setting default title
-        $title = $resource->getTitle() ? $resource->getTitle() : OntoWiki_Utils::contractNamespace($resource->getIri());
+        if (!empty($resource->getTitle())) {
+            $title = $resource->getTitle();
+        } else {
+            $title = OntoWiki_Utils::contractNamespace($resource->getIri());
+        }
         $windowTitle = sprintf($translate->_('Versions for %1$s'), $title);
         $this->view->placeholder('main.window.title')->set($windowTitle);
 
@@ -411,7 +420,7 @@ public function rollbackAction()
 
         // Trying to rollback actions from POST parameters (style: serialized in actionid)
         foreach (unserialize($params['actionid']) as $id) {
-                if ( $versioning->rollbackAction($id) ) {
+                if ($versioning->rollbackAction($id)) {
                     $successIDs[] = $id;
                 } else {
                     $errorIDs[] = $id;
diff --git a/extensions/history/HistoryHelper.php b/extensions/history/HistoryHelper.php
index 5af949c3e..b47f621b4 100644
--- a/extensions/history/HistoryHelper.php
+++ b/extensions/history/HistoryHelper.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
diff --git a/extensions/imagelink/ImagelinkPlugin.php b/extensions/imagelink/ImagelinkPlugin.php
index c45de25d5..2af23b303 100644
--- a/extensions/imagelink/ImagelinkPlugin.php
+++ b/extensions/imagelink/ImagelinkPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/imprint/ImprintModule.php b/extensions/imprint/ImprintModule.php
index b2fe2d8c7..48f26c492 100644
--- a/extensions/imprint/ImprintModule.php
+++ b/extensions/imprint/ImprintModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/jsonrpc/EvolutionJsonrpcAdapter.php b/extensions/jsonrpc/EvolutionJsonrpcAdapter.php
index cc0f60192..35bc7f26a 100644
--- a/extensions/jsonrpc/EvolutionJsonrpcAdapter.php
+++ b/extensions/jsonrpc/EvolutionJsonrpcAdapter.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/jsonrpc/JsonrpcController.php b/extensions/jsonrpc/JsonrpcController.php
index 9be535fbb..0150f7b04 100644
--- a/extensions/jsonrpc/JsonrpcController.php
+++ b/extensions/jsonrpc/JsonrpcController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/jsonrpc/MetaJsonrpcAdapter.php b/extensions/jsonrpc/MetaJsonrpcAdapter.php
index fa878c32b..96b820ecd 100644
--- a/extensions/jsonrpc/MetaJsonrpcAdapter.php
+++ b/extensions/jsonrpc/MetaJsonrpcAdapter.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -23,6 +23,7 @@ class MetaJsonrpcAdapter
         'meta'      => 'methods to query the json service itself',
         'store'     => 'methods to manipulate and query the store',
         'model'     => 'methods to manipulate and query a specific model',
+        'resource'  => 'methods to manipulate and query a specific resource',
         //'evolution' => 'methods to manage and use the evolution engine',
     );
 
diff --git a/extensions/jsonrpc/ModelJsonrpcAdapter.php b/extensions/jsonrpc/ModelJsonrpcAdapter.php
index 19d78e8c1..44ae3ba17 100644
--- a/extensions/jsonrpc/ModelJsonrpcAdapter.php
+++ b/extensions/jsonrpc/ModelJsonrpcAdapter.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -136,6 +136,30 @@ public function deletePrefix($modelIri, $prefix = 'rdf')
         }
     }
 
+    /**
+     * @desc get the titles for a given array of resources
+     *
+     * @param string modelIri
+     * @param array resources
+     *
+     * @return array An associative array of resources and their titles
+     */
+    public function getTitles($modelIri, $resources)
+    {
+        // ["http://pfarrerbuch.comiles.eu/sachsen/"]
+        $resources = json_decode($resources);
+
+        $model    = $this->_store->getModel($modelIri);
+        $titleHelper = new OntoWiki_Model_TitleHelper($model, $this->_store);
+        $titleHelper->addResources($resources);
+        $titles = array();
+        foreach ($resources as $resourceUri) {
+            $titles[$resourceUri] = $titleHelper->getTitle($resourceUri);
+        }
+
+        return $titles;
+    }
+
     /**
      * @desc counts the number of statements of a model
      *
diff --git a/extensions/jsonrpc/ResourceJsonrpcAdapter.php b/extensions/jsonrpc/ResourceJsonrpcAdapter.php
new file mode 100644
index 000000000..baff60d3d
--- /dev/null
+++ b/extensions/jsonrpc/ResourceJsonrpcAdapter.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * This file is part of the {@link http://ontowiki.net OntoWiki} project.
+ *
+ * @copyright Copyright (c) 2014-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
+/**
+ * JSON RPC Class, this wrapper class is for all model RPC calls
+ *
+ * @category   OntoWiki
+ * @package    Extensions_Jsonrpc
+ * @copyright  Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license    http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+class ResourceJsonrpcAdapter
+{
+    private $_store  = null;
+    private $_erfurt = null;
+    private $_config = null;
+
+    public function __construct()
+    {
+        $this->_store  = Erfurt_App::getInstance()->getStore();
+        $this->_erfurt = Erfurt_App::getInstance();
+        $this->_config = $this->_erfurt->getConfig();
+    }
+
+    /**
+     * @desc get a resource as RDF/JSON
+     *
+     * @param string modelIri
+     * @param string resourceIri
+     * @param string format
+     *
+     * @return string
+     */
+    public function get($modelIri, $resourceIri, $format = 'rdfjson')
+    {
+        if (!$this->_store->isModelAvailable($modelIri)) {
+            return 'Error: Model "' . $modelIri . '" is not available.';
+        }
+        $editable = $this->_store->getModel($modelIri)->isEditable();
+        $supportedFormats = Erfurt_Syntax_RdfSerializer::getSupportedFormats();
+        if (!isset($supportedFormats[$format])) {
+            return 'Error: Format "' . $format . '" is not supported by serializer.';
+        }
+        $serializer = Erfurt_Syntax_RdfSerializer::rdfSerializerWithFormat($format);
+        // create hash for current status of resource
+        $currentDataHash = $this->_getCurrentResourceHash($modelIri, $resourceIri);
+        $return = new stdClass();
+        $return->dataHash = $currentDataHash;
+        $return->editable = $editable;
+        $return->data = $serializer->serializeResourceToString($resourceIri, $modelIri);
+        return $return;
+    }
+
+    /**
+     * @desc update a modified resource
+     *
+     * @param string modelIri
+     * @param string resourceIri
+     * @param string data
+     * @param string format
+     * @param string origDataHash
+     *
+     * @return string
+     */
+    public function update($modelIri, $resourceIri, $data, $origDataHash, $format = 'rdfjson')
+    {
+        $model = $this->_store->getModel($modelIri);
+        if (!$model->isEditable()) {
+            return 'Error: Model "' . $modelIri . '" is not available.';
+        }
+        // TODO check for formats supported by the parser (not yet implemented)
+
+        // calculate hash of current status and compare to commited hash
+        $currentDataHash = $this->_getCurrentResourceHash($modelIri, $resourceIri);
+
+        if ($currentDataHash !== $origDataHash) {
+            return 'Error: Resource "' . $resourceIri . '" was edited during your session.';
+        }
+
+        // get current statements of resource
+        $resource = $model->getResource($resourceIri);
+        $originalStatements = $resource->getDescription();
+
+        // get new statements of resource
+        $parser = Erfurt_Syntax_RdfParser::rdfParserWithFormat($format);
+        $modifiedStatements = $parser->parse($data, Erfurt_Syntax_RdfParser::LOCATOR_DATASTRING);
+
+        $model->updateWithMutualDifference($originalStatements, $modifiedStatements);
+
+        return true;
+    }
+
+    /**
+     * @desc counts the number of statements of a model
+     *
+     * @param string modelIri
+     * @param string whereSpec
+     * @param string countSpec
+     *
+     * @return string
+     */
+    public function count($modelIri, $whereSpec = '{?s ?p ?o}', $countSpec = '*')
+    {
+        return $this->_store->countWhereMatches($modelIri, $whereSpec, $countSpec);
+    }
+
+    /**
+     * @desc create a new knowledge base
+     *
+     * @param string $modelIri
+     *
+     * @return bool
+     */
+    public function create($modelIri)
+    {
+        $this->_store->getNewModel($modelIri);
+
+        return true;
+    }
+
+    /**
+     * @desc drop an existing knowledge base
+     *
+     * @param string $modelIri
+     *
+     * @return bool
+     */
+    public function drop($modelIri)
+    {
+        $this->_store->deleteModel($modelIri);
+
+        return true;
+    }
+
+    /**
+     * This methid calculates a hash value for a resource including its IRI and all its properties.
+     *
+     * @param string $modelIri the IRI of the model
+     * @param string $resourceIri the IRI of the resource
+     *
+     * @return string with the hash value
+     */
+    private function _getCurrentResourceHash($modelIri, $resourceIri)
+    {
+        $resource = $this->_store->getModel($modelIri)->getResource($resourceIri);
+        $statements = $resource->getDescription();
+        return md5(serialize($statements));
+    }
+}
diff --git a/extensions/jsonrpc/StoreJsonrpcAdapter.php b/extensions/jsonrpc/StoreJsonrpcAdapter.php
index b8ddc5591..e4deffd25 100644
--- a/extensions/jsonrpc/StoreJsonrpcAdapter.php
+++ b/extensions/jsonrpc/StoreJsonrpcAdapter.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2012-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/linkeddataserver/LinkeddataPlugin.php b/extensions/linkeddataserver/LinkeddataPlugin.php
index 6de75481d..862f843fb 100644
--- a/extensions/linkeddataserver/LinkeddataPlugin.php
+++ b/extensions/linkeddataserver/LinkeddataPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -28,17 +28,17 @@ class LinkeddataPlugin extends OntoWiki_Plugin
      *
      * @var array
      */
-    private $_typeMapping
-        = array(
-            DEFAULT_TYPE            => 'html', // default is xhtml
-            'text/html'             => 'html', // we only deliver XML-compatible html
-            'application/xhtml+xml' => 'html',
-            'application/rdf+xml'   => 'rdf',
-            'text/n3'               => 'n3',
-            'text/turtle'           => 'ttl',
-            'application/json'      => 'json',
-            'application/xml'       => 'html' // TODO: should this be xhtml or rdf?
-        );
+    private $_typeMapping = array(
+        DEFAULT_TYPE            => 'html', // default is xhtml
+        'text/html'             => 'html', // we only deliver XML-compatible html
+        'application/xhtml+xml' => 'html',
+        'application/rdf+xml'   => 'rdf',
+        'text/n3'               => 'n3',
+        'text/turtle'           => 'ttl',
+        'application/rdf+json'  => 'json',
+        'application/json'      => 'json',
+        'application/xml'       => 'html' // TODO: should this be xhtml or rdf?
+    );
 
     /**
      * This method is called, when the onIsDispatchable event was triggered.
@@ -71,7 +71,10 @@ public function onIsDispatchable($event)
         $request  = Zend_Controller_Front::getInstance()->getRequest();
         $response = Zend_Controller_Front::getInstance()->getResponse();
 
-        $uri = $event->uri;
+        $aliascheck = new Erfurt_Event('onResolveDomainAliasInput');
+        $aliascheck->uri = $event->uri;
+        $aliascheck->trigger();
+        $uri = $aliascheck->uri;
 
         try {
             // Check for a supported type by investigating the suffix of the URI or by
@@ -106,6 +109,7 @@ public function onIsDispatchable($event)
                 case 'rdf':
                 case 'n3':
                 case 'ttl':
+                case 'json':
                     // Check the config, whether provenance information should be included.
                     $prov = false;
                     if (isset($this->_privateConfig->provenance)
@@ -117,20 +121,16 @@ public function onIsDispatchable($event)
 
                     // Special case: If the graph URI is identical to the requested URI, we export
                     // the whole graph instead of only data regarding the resource.
+                    $urlSpec = array();
                     if ($graph === $uri) {
-                        $controllerName = 'model';
-                        $actionName     = 'export';
+                        $urlSpec = array('controller' => 'model', 'action' => 'export');
                     } else {
-                        $controllerName = 'resource';
-                        $actionName     = 'export';
+                        $urlSpec = array('route' => 'data');
                     }
 
                     // Create a URL with the export action on the resource or model controller.
                     // Set the required parameters for this action.
-                    $url = new OntoWiki_Url(
-                        array('controller' => $controllerName, 'action' => $actionName),
-                        array()
-                    );
+                    $url = new OntoWiki_Url($urlSpec, array());
                     $url->setParam('r', $uri, true)
                         ->setParam('f', $type)
                         ->setParam('m', $graph)
diff --git a/extensions/listmodules/ShowpropertiesModule.php b/extensions/listmodules/ShowpropertiesModule.php
index 3e3d9abe7..ab876eb80 100644
--- a/extensions/listmodules/ShowpropertiesModule.php
+++ b/extensions/listmodules/ShowpropertiesModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -101,7 +101,7 @@ private function filterProperties($properties)
             $store = $this->_owApp->erfurt->getStore();
             //query for hidden properties
             $query = new Erfurt_Sparql_SimpleQuery();
-            $query->setProloguePart(
+            $query->setSelectClause(
                 'PREFIX sysont: <http://ns.ontowiki.net/SysOnt/>
                                      SELECT ?uri'
             )
diff --git a/extensions/listmodules/showproperties.js b/extensions/listmodules/showproperties.js
index 3366d1138..df35a39de 100644
--- a/extensions/listmodules/showproperties.js
+++ b/extensions/listmodules/showproperties.js
@@ -1,12 +1,16 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(document).ready(function() {
     //Set up drag- and drop-functionality
     $('.show-property').draggable({
-                            scope: 'Resource',
-                            helper: 'clone',
-                            zIndex: 10000,
-                            scroll: false,
-                            appendTo: 'body'
-                        });
+        scope: 'Resource',
+        helper: 'clone',
+        zIndex: 10000,
+        scroll: false,
+        appendTo: 'body'
+});
 
     // highlight previously selected properties
     $('.show-property').each(function() {
@@ -16,29 +20,25 @@ $(document).ready(function() {
         } else {
             var pos = $.inArray(propUri, shownInverseProperties);
         }
-        	
         if (pos > -1) {
             $(this).addClass('selected');
         }
     })
+
     function handleNewSelect() {
         var propUri = $(this).attr('about');
         $(this).toggleClass('selected');
         
         var action = $(this).hasClass('selected')? "add" : "remove";
-           
         var inverse = $(this).hasClass('InverseProperty');
-
         var label = $(this).attr("title");
-        
         var data = { shownProperties : [{
-                "uri" : propUri,
-                "label" : label,
-                "action" : action,
-                "inverse" : inverse
-            }]
-        };
-        
+            "uri" : propUri,
+            "label" : label,
+            "action" : action,
+            "inverse" : inverse
+        }]};
+
         var serialized = $.toJSON(data);
         //
         //reload page
@@ -57,7 +57,6 @@ $(document).ready(function() {
                 $('body').trigger('ontowiki.resource-list.reloaded');
                 showPropertiesAddDroppableToListTable();
             });
-
       };
 
     function showPropertiesAddDroppableToListTable() {
@@ -69,10 +68,9 @@ $(document).ready(function() {
              drop:
                  function(event, ui) {$(ui.draggable).each(handleNewSelect);}
         });
-    }    
-    
+    }
+
     //set click handler for the properties
     $('.show-property').click(handleNewSelect);
-    
     showPropertiesAddDroppableToListTable();
 })
diff --git a/extensions/literaltypes/LiteraltypesPlugin.php b/extensions/literaltypes/LiteraltypesPlugin.php
index 3a2225e64..eff831e99 100644
--- a/extensions/literaltypes/LiteraltypesPlugin.php
+++ b/extensions/literaltypes/LiteraltypesPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/mail/doap.n3 b/extensions/mail/doap.n3
index 0ca9e3a47..924273fef 100644
--- a/extensions/mail/doap.n3
+++ b/extensions/mail/doap.n3
@@ -11,7 +11,7 @@
 :mail a doap:Project ;
   doap:name "mail" ;
   owconfig:privateNamespace <https://github.com/AKSW/mail/raw/master/doap.n3#> ;
-  owconfig:enabled "true"^^xsd:boolean ;
+  owconfig:enabled "false"^^xsd:boolean ;
   rdfs:label "Mail" ;
   doap:description "A plug-in that tests mail support" ;
   owconfig:authorLabel "Würker Christian" ;
diff --git a/extensions/mail/jobs/Mail.php b/extensions/mail/jobs/Mail.php
index c77c39409..c8b03bd79 100644
--- a/extensions/mail/jobs/Mail.php
+++ b/extensions/mail/jobs/Mail.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright   Copyright (c) 2013, {@link http://aksw.org AKSW}
- * @license     http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2013-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
@@ -40,16 +40,16 @@ public function run($workload)
         $transport = new Zend_Mail_Transport_Smtp($smtpServer, $config);
 
         if (is_object($workload)) {
-            if (empty($workload->sender)){
+            if (empty($workload->sender)) {
                 throw new InvalidArgumentException('Workload is missing sender');
             }
-            if (empty($workload->receiver)){
+            if (empty($workload->receiver)) {
                 throw new InvalidArgumentException('Workload is missing receiver');
             }
-            if (empty($workload->subject)){
+            if (empty($workload->subject)) {
                 throw new InvalidArgumentException('Workload is missing subject');
             }
-            if (empty($workload->body)){
+            if (empty($workload->body)) {
                 throw new InvalidArgumentException('Workload is missing body');
             }
             $mail = new Zend_Mail();
diff --git a/extensions/mailtolink/MailtolinkPlugin.php b/extensions/mailtolink/MailtolinkPlugin.php
index 170757a8f..0718d6e33 100644
--- a/extensions/mailtolink/MailtolinkPlugin.php
+++ b/extensions/mailtolink/MailtolinkPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/markdown/MarkdownPlugin.php b/extensions/markdown/MarkdownPlugin.php
index bc1589b99..5ac628139 100644
--- a/extensions/markdown/MarkdownPlugin.php
+++ b/extensions/markdown/MarkdownPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/modellist/ModellistModule.php b/extensions/modellist/ModellistModule.php
index 0654dd097..5c3fea6ca 100644
--- a/extensions/modellist/ModellistModule.php
+++ b/extensions/modellist/ModellistModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/modellist/modellist.js b/extensions/modellist/modellist.js
index 6925156c5..a702fbd22 100644
--- a/extensions/modellist/modellist.js
+++ b/extensions/modellist/modellist.js
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(document).ready(function() {
     $('.modellist_hidden_button').livequery('click', function() {
         if ($(this).hasClass('show')) {
@@ -24,17 +28,17 @@ function updateModellistModule()
     $('.contextmenu-enhanced .contextmenu').fadeOut(effectTime, function(){
         $(this).remove();
     })
-	
+
     var options = {
         url: urlBase + 'module/get/name/modellist/id/modellist'
     };
-	
+
     $.get(options.url, function(data) {
         $('#modellist').replaceWith(data);
         $('#modellist').addClass('has-contextmenus-block')
         .addClass('windowbuttonscount-right-1')
         .addClass('windowbuttonscount-left-1');
-		
+
         $('#modellist').enhanceWindow();
     });
 }
diff --git a/extensions/navigation/NavigationController.php b/extensions/navigation/NavigationController.php
index 747a3667c..de61d14ae 100644
--- a/extensions/navigation/NavigationController.php
+++ b/extensions/navigation/NavigationController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -279,6 +279,7 @@ protected function _queryNavigationEntries($setup)
             'NavigationController _queryNavigationEntries Query: ' . $query->__toString()
         );
         //*/
+        //
 
         // get extended results
         $allResults = $this->_model->sparqlQuery(
@@ -670,7 +671,8 @@ protected function _buildQuery($setup, $forImplicit = false)
 
         // set offset
         if (isset($setup->state->offset) && $setup->state->lastEvent == 'more') {
-            $query->setLimit($this->_limit + $setup->state->offset + 1);
+            $query->setOffset($setup->state->offset);
+            $query->setLimit($this->_limit + 1);
         } else {
             $query->setLimit($this->_limit + 1);
         }
@@ -891,9 +893,17 @@ protected function _buildSubCheckQuery($uri, $setup)
             $classVar
         );*/
         // add filter
-        $elements[] = new Erfurt_Sparql_Query2_Filter(
-            new Erfurt_Sparql_Query2_sameTerm($searchVar, new Erfurt_Sparql_Query2_IriRef($uri))
-        );
+        if ($this->_store->isInSyntaxSupported()) { // e.g. Virtuoso
+            $elements[] = new Erfurt_Sparql_Query2_Filter(
+                new Erfurt_Sparql_Query2_InExpression($searchVar, array(new Erfurt_Sparql_Query2_IriRef($uri)))
+            );
+        } else { // sameTerm || sameTerm ... as supported by EfZendDb adapter
+            // add filter
+            $elements[] = new Erfurt_Sparql_Query2_Filter(
+                new Erfurt_Sparql_Query2_Equals($searchVar, new Erfurt_Sparql_Query2_IriRef($uri))
+            );
+        }
+        // build
         $query->addElements($elements);
         $query->setLimit(1);
 
diff --git a/extensions/navigation/NavigationHelper.php b/extensions/navigation/NavigationHelper.php
index b43429925..56f456eb5 100644
--- a/extensions/navigation/NavigationHelper.php
+++ b/extensions/navigation/NavigationHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -130,7 +130,7 @@ public static function getInstancesTriples($uri, $setup)
 
             $uriElem      = new Erfurt_Sparql_Query2_IriRef($uri);
             $filterUris[] = $uriElem;
-            $filterType[] = new Erfurt_Sparql_Query2_sameTerm($classVar, $uriElem);
+            $filterType[] = new Erfurt_Sparql_Query2_Equals($classVar, $uriElem);
 
             // add uri to counted
             $counted[] = $uri;
@@ -317,7 +317,7 @@ public static function getSearchTriples($setup, $forImplicit = false, $backend =
                 foreach ($setup->config->hierarchyTypes as $type) {
                     $uriElem      = new Erfurt_Sparql_Query2_IriRef($type);
                     $filterUris[] = $uriElem;
-                    $filterType[] = new Erfurt_Sparql_Query2_sameTerm($classVar, $uriElem);
+                    $filterType[] = new Erfurt_Sparql_Query2_Equals($classVar, $uriElem);
                 }
 
                 $owApp = OntoWiki::getInstance();
diff --git a/extensions/navigation/NavigationModule.php b/extensions/navigation/NavigationModule.php
index 9c9ce8ed3..15a714990 100644
--- a/extensions/navigation/NavigationModule.php
+++ b/extensions/navigation/NavigationModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/navigation/doap.n3 b/extensions/navigation/doap.n3
index 96aef3cf9..4dba492ac 100644
--- a/extensions/navigation/doap.n3
+++ b/extensions/navigation/doap.n3
@@ -105,6 +105,7 @@
           :hiddenRelation (<http://ns.ontowiki.net/SysOnt/hidden>) ;
           :showImplicitElements "true"^^xsd:boolean ;
           :showEmptyElements "true"^^xsd:boolean ;
+          :showHiddenElements "false"^^xsd:boolean ;
           :showCounts "false"^^xsd:boolean ;
           :checkSub "true"^^xsd:boolean ;
           :hideDefaultHierarchy "false"^^xsd:boolean ;
diff --git a/extensions/navigation/navigation.css b/extensions/navigation/navigation.css
index caec7ccbd..b151e0a6a 100644
--- a/extensions/navigation/navigation.css
+++ b/extensions/navigation/navigation.css
@@ -1,3 +1,7 @@
+/*
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 .content h2.navRoot
 {
     font-size:1em;
@@ -21,12 +25,28 @@
 }
 
 #navigation .icon.icon-arrow-previous { background-image:url(icon-previous.png); width:12px; }
+
 #navigation .icon.icon-arrow-first { background-image:url(icon-first.png); width:8px; }
 
 #navigation .navRoot.fancybuttons .icon.icon-arrow-previous
-{ background-color:#999; width:1.2em; height:1.2em; -moz-border-radius:0.6em; border-radius:0.6em; position:relative; left:-0.25em; }
+{
+    background-color:#999;
+    width:1.2em;
+    height:1.2em;
+    -moz-border-radius:0.6em;
+    border-radius:0.6em;
+    position:relative;
+    left:-0.25em;
+}
+
 #navigation .navRoot.fancybuttons .icon.icon-arrow-first
-{ background-color:#bbb; width:0.9em; height:0.9em; -moz-border-radius:0.45em; border-radius:0.45em; }
+{
+    background-color:#bbb;
+    width:0.9em;
+    height:0.9em;
+    -moz-border-radius:0.45em;
+    border-radius:0.45em;
+}
 
 /* set contextmenu more left */
 #navigation .has-contextmenus-block li a:hover span.button
diff --git a/extensions/navigation/navigation.js b/extensions/navigation/navigation.js
index 2fc64f071..d26ee5921 100644
--- a/extensions/navigation/navigation.js
+++ b/extensions/navigation/navigation.js
@@ -6,267 +6,273 @@
  * @license    http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  *
  */
+(function(){
+    /**
+     * The main document.ready assignments and code
+     */
+    $(document).ready(function() {
+        /* some used variables */
+        navigationContainer = $('#navigation-content');
+        navigationInput = $('#navigation-input');
+        navigationWindow = $('#navigation');
+        navigationExploreUrl = urlBase + 'navigation/explore';
+        navigationMoreUrl = urlBase + 'navigation/more';
+        navigationSaveUrl = urlBase + 'navigation/savestate';
+        navigationLoadUrl = urlBase + 'navigation/loadstate';
+        navigationListUrl = urlBase + 'list';
+        navSetup = '';
+
+        navigationInput.livequery('keypress', function(event) {
+            // do not create until user pressed enter
+            if ((event.which === 13) && (event.currentTarget.value !== '') ) {
+                navigationEvent('search', event.currentTarget.value);
+                $(event.currentTarget).val('');
+                return false;
+            } else if ( event.which === 13 ) {
+                return false;
+            }
+            return true;
+        });
 
-/**
- * The main document.ready assignments and code
- */
-$(document).ready(function() {
-    /* some used variables */
-    navigationContainer = $('#navigation-content');
-    navigationInput = $("#navigation-input");
-    navigationWindow = $("#navigation");
-    navigationExploreUrl = urlBase + 'navigation/explore';
-    navigationMoreUrl = urlBase + 'navigation/more';
-    navigationSaveUrl = urlBase + 'navigation/savestate';
-    navigationLoadUrl = urlBase + 'navigation/loadstate';
-    navigationListUrl = urlBase + 'list';
-    navSetup = '';
-
-    navigationInput.livequery('keypress', function(event) {
-        // do not create until user pressed enter
-        if ((event.which == 13) && (event.currentTarget.value != '') ) {
-            navigationEvent('search', event.currentTarget.value);
-            $(event.currentTarget).val('');
-            return false;
-        } else if ( event.which == 13 ) {
-            return false;
+        if( typeof navigationStateSetup !== 'undefined'){
+            navigationSetup = navigationStateSetup;
         }
-        return true;
     });
-    
-    if( typeof navigationStateSetup != 'undefined'){
-        navigationSetup = navigationStateSetup;
-    }
-});
 
-/**
- * Setups the Navgiation Parameters and start the request
- */
-function navigationEvent (navEvent, eventParameter) {
-    var setup, navType;
-
-    /* init config when not existing or resetted by user */
-    if ( ( typeof navigationSetup == 'undefined' ) || (navEvent == 'reset') || (navEvent == 'setType') ) {
-        // set the default or setType config
-        if (navEvent == 'setType') {
-            navType = eventParameter;
+    /**
+     * Setups the Navgiation Parameters and start the request
+     */
+    var navigationEvent = function (navEvent, eventParameter) {
+        var setup, navType;
+
+        /* init config when not existing or resetted by user */
+        if ((typeof navigationSetup === 'undefined') || (navEvent === 'reset') || (navEvent === 'setType')) {
+            // set the default or setType config
+            if (navEvent === 'setType') {
+                navType = eventParameter;
+            } else {
+                navType = navigationConfig.defaults.config;
+            }
+            var config = navigationConfig.config[navType];
+
+            // the limit
+            var limit = navigationConfig.defaults.limit;
+
+            // set the state
+            var state = {};
+            state.limit = limit;
+            state.path = [];
+            // pack state and config into setup value for post
+            setup = {'state': state, 'config': config};
         } else {
-            navType = navigationConfig['defaults']['config'];
+            setup = navigationSetup;
         }
-        var config = navigationConfig['config'][navType];
-
-        // the limit
-        var limit = navigationConfig['defaults']['limit'];
-
-        // set the state
-        var state = {};
-        state['limit'] = limit;
-        state['path'] = new Array;
-        // pack state and config into setup value for post
-        setup = {'state': state, 'config': config};
-    } else {
-        setup = navigationSetup;
-    }
 
-    // delete old search string
-    delete(setup['state']['searchString']);
+        // delete old search string
+        delete(setup.state.searchString);
 
-    // nav event
-    switch (navEvent) {
+        // nav event
+        switch (navEvent) {
         case 'init':
             // save hidden, implicit and empty to state
-            if(typeof navigationStateSetup != 'undefined'){
-                if(typeof navigationStateSetup['state']['showEmpty'] != 'undefined'){
-                    setup['state']['showEmpty'] = navigationStateSetup['state']['showEmpty'];
+            if(typeof navigationStateSetup !== 'undefined'){
+                if(typeof navigationStateSetup.state.showEmpty !== 'undefined'){
+                    setup.state.showEmpty = navigationStateSetup.state.showEmpty;
                 }
-                if(typeof navigationStateSetup['state']['showImplicit'] != 'undefined'){
-                    setup['state']['showImplicit'] = navigationStateSetup['state']['showImplicit'];
+                if(typeof navigationStateSetup.state.showImplicit !== 'undefined'){
+                    setup.state.showImplicit = navigationStateSetup.state.showImplicit;
                 }
-                if(typeof navigationStateSetup['state']['showHidden'] != 'undefined'){
-                    setup['state']['showHidden'] = navigationStateSetup['state']['showHidden'];
+                if(typeof navigationStateSetup.state.showHidden !== 'undefined'){
+                    setup.state.showHidden = navigationStateSetup.state.showHidden;
                 }
             }else{
-                if(setup['config']['showEmptyElements'] == '1'){
-                    setup['state']['showEmpty'] = true;
+                if(setup.config.showEmptyElements === '1'){
+                    setup.state.showEmpty = true;
                 }
-                if(setup['config']['showImplicitElements'] == '1'){
-                    setup['state']['showImplicit'] = true;
+                if(setup.config.showImplicitElements === '1'){
+                    setup.state.showImplicit = true;
                 }
-                if(setup['config']['showHiddenElements'] == '1'){
-                    setup['state']['showHidden'] = true;
+                if(setup.config.showHiddenElements === '1'){
+                    setup.state.showHidden = true;
                 }
             }
             // remove init sign and setup module title
             navigationContainer.removeClass('init-me-please');
-            $('#navigation h1.title').text('Navigation: '+setup['config']['title']);
+            $('#navigation h1.title').text('Navigation: '+setup.config.title);
             break;
         case 'reset':
-            if(setup['config']['showEmptyElements'] == '1'){
-                setup['state']['showEmpty'] = true;
+            if(setup.config.showEmptyElements === '1'){
+                setup.state.showEmpty = true;
             }
-            if(setup['config']['showImplicitElements'] == '1'){
-                setup['state']['showImplicit'] = true;
+            if(setup.config.showImplicitElements === '1'){
+                setup.state.showImplicit = true;
             }
-            if(setup['config']['showHiddenElements'] == '1'){
-                setup['state']['showHidden'] = true;
+            if(setup.config.showHiddenElements === '1'){
+                setup.state.showHidden = true;
             }
         case 'setType':
             // remove init sign and setup module title
             navigationContainer.removeClass('init-me-please');
-            $('#navigation h1.title').text('Navigation: '+setup['config']['title']);
+            $('#navigation h1.title').text('Navigation: '+setup.config.title);
             break;
 
         case 'refresh':
             break;
 
         case 'showResourceList':
-            setup['state']['parent'] = eventParameter;
+            setup.state.parent = eventParameter;
             break;
 
         case 'navigateDeeper':
             // save path element
-            if ( typeof setup['state']['parent'] != 'undefined' ) {
-                setup['state']['path'].push(setup['state']['parent']);
+            if ( typeof setup.state.parent !== 'undefined' ) {
+                setup.state.path.push(setup.state.parent);
             }
             // set new parent
-            setup['state']['parent'] = eventParameter;
+            setup.state.parent = eventParameter;
             break;
-        
+
         case 'navigateHigher':
             // count path elements
-            var pathlength = setup['state']['path'].length;
-            if ( typeof setup['state']['parent'] == 'undefined' ) {
+            var pathlength = setup.state.path.length;
+            if ( typeof setup.state.parent === 'undefined' ) {
                 // we are at root level, so nothing higher than here
                 return;
             }
-            if (pathlength == 0) {
+            if (pathlength === 0) {
                 // we are at the first sublevel (so we go to root)
-                delete(setup['state']['parent']);
+                delete(setup.state.parent);
             } else {
                 // we are somewhere deeper ...
                 // set parent to the last path element
-                setup['state']['parent'] = setup['state']['path'][pathlength-1];
+                setup.state.parent = setup.state.path[pathlength-1];
                 // and delete the last path element
-                setup['state']['path'].pop();
+                setup.state.path.pop();
             }
             break;
 
         case 'navigateRoot':
             // we are at root level, so nothing higher than here
             // exception: after a search, it should be also rootable
-            if ( ( typeof setup['state']['parent'] == 'undefined' )
-                && ( setup['state']['lastEvent'] != 'search' ) ){
+            if (typeof setup.state.parent === 'undefined' && setup.state.lastEvent !== 'search'){
                 return;
             }
-            delete(setup['state']['parent']);
-            setup['state']['path'] = new Array;
+            delete(setup.state.parent);
+            setup.state.path = [];
             break;
-            
+
         case 'search':
-            setup['state']['searchString'] = eventParameter;
+            setup.state.searchString = eventParameter;
             break;
 
         case 'setLimit':
-            setup['state']['limit'] = eventParameter;
-            delete(setup['state']['offset']);
+            setup.state.limit = eventParameter;
+            delete(setup.state.offset);
             break;
 
         case 'toggleHidden':
-            if ( typeof setup['state']['showHidden'] != 'undefined' ) {
-                delete(setup['state']['showHidden']);
-                $("a[href='javascript:navigationEvent(\'toggleHidden\')']").text("Show Hidden Elements");
+            if (typeof setup.state.showHidden !== 'undefined') {
+                delete(setup.state.showHidden);
+                $('a[href=\'javascript:navigationEvent(\'toggleHidden\')\']').text('Show Hidden Elements');
             } else {
-                setup['state']['showHidden'] = true;
-                $("a[href='javascript:navigationEvent(\'toggleHidden\')']").text("Hide Hidden Elements");
+                setup.state.showHidden = true;
+                $('a[href=\'javascript:navigationEvent(\'toggleHidden\')\']').text('Hide Hidden Elements');
             }
             break;
 
         case 'toggleEmpty':
             // if no state is set, use default value from config
-            if ( typeof setup['state']['showEmpty'] == 'undefined' ) {
-                if ( typeof setup['config']['showEmptyElements'] != 'undefined' ) {
-                    setup['state']['showEmpty'] = setup['config']['showEmptyElements'];
-                    if(setup['state']['showEmpty'] == true){
-                        $("a[href='javascript:navigationEvent(\'toggleEmpty\')']").text("Hide Empty Elements");
+            if ( typeof setup.state.showEmpty === 'undefined' ) {
+                if ( typeof setup.config.showEmptyElements !== 'undefined' ) {
+                    setup.state.showEmpty = setup.config.showEmptyElements;
+                    if(setup.state.showEmpty === true){
+                        $('a[href=\'javascript:navigationEvent(\'toggleEmpty\')\']').text('Hide Empty Elements');
                     }
                 } else {
-                    setup['state']['showEmpty'] = true;
-                    $("a[href='javascript:navigationEvent(\'toggleEmpty\')']").text("Hide Empty Elements");
+                    setup.state.showEmpty = true;
+                    $('a[href=\'javascript:navigationEvent(\'toggleEmpty\')\']').text('Hide Empty Elements');
                 }
-            } else if (setup['state']['showEmpty'] == false) {
-                setup['state']['showEmpty'] = true;
-                $("a[href='javascript:navigationEvent(\'toggleEmpty\')']").text("Hide Empty Elements");
+            } else if (setup.state.showEmpty === false) {
+                setup.state.showEmpty = true;
+                $('a[href=\'javascript:navigationEvent(\'toggleEmpty\')\']').text('Hide Empty Elements');
             } else {
-                setup['state']['showEmpty'] = false;
-                $("a[href='javascript:navigationEvent(\'toggleEmpty\')']").text("Show Empty Elements");
+                setup.state.showEmpty = false;
+                $('a[href=\'javascript:navigationEvent(\'toggleEmpty\')\']').text('Show Empty Elements');
             }
             break;
 
         case 'toggleImplicit':
             // if no state is set, use default value from config
-            if ( typeof setup['state']['showImplicit'] == 'undefined' ) {
-                if ( typeof setup['config']['showImplicitElements'] != 'undefined' ) {
-                    setup['state']['showImplicit'] = setup['config']['showImplicitElements'];
-                    if(setup['state']['showImplicit'] == true){
-                        $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Hide Implicit Elements");
-                    }else{
-                        $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Show Implicit Elements");
+            if (typeof setup.state.showImplicit === 'undefined') {
+                if (typeof setup.config.showImplicitElements !== 'undefined') {
+                    setup.state.showImplicit = setup.config.showImplicitElements;
+                    if (setup.state.showImplicit === true) {
+                        $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Hide Implicit Elements');
+                    } else {
+                        $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Show Implicit Elements');
                     }
                 } else {
-                    setup['state']['showImplicit'] = true;
-                    $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Hide Implicit Elements");
+                    setup.state.showImplicit = true;
+                    $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Hide Implicit Elements');
                 }
-            } else if (setup['state']['showImplicit'] == false) {
-                setup['state']['showImplicit'] = true;
-                $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Hide Implicit Elements");
+            } else if (setup.state.showImplicit === false) {
+                setup.state.showImplicit = true;
+                $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Hide Implicit Elements');
             } else {
-                setup['state']['showImplicit'] = false;
-                $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Show Implicit Elements");
+                setup.state.showImplicit = false;
+                $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Show Implicit Elements');
             }
             break;
         case 'more':
-            if( setup['state']['offset'] !== undefined  ){
-                setup['state']['offset'] = setup['state']['offset']*2;
+            if( setup.state.offset !== undefined  ){
+                setup.state.offset += 10;
             }else{
-                setup['state']['offset'] = parseInt(setup['state']['limit']) + 10;
+                setup.state.offset = parseInt(setup.state.limit, 10);
             }
-            setup['state']['limit'] = setup['state']['offset'];
+            setup.state.limit = setup.state.offset;
             break;
         case 'setSort':
-            setup['state']['sorting'] = eventParameter;
+            setup.state.sorting = eventParameter;
             break;
         default:
             alert('error: unknown navigation event: '+navEvent);
             return;
-    }
-
-    setup['state']['lastEvent'] = navEvent;
-    navigationSetup = setup;
-    navSetup = setup;
-    navigationLoad (navEvent, setup);
-    return; 
-}
+        }
 
-/**
- * request the navigation
- */
-function navigationLoad (navEvent, setup) {
-    if (typeof setup == 'undefined') {
-        alert('error: No navigation setup given, but navigationLoad requested');
+        setup.state.lastEvent = navEvent;
+        navigationSetup = setup;
+        navSetup = setup;
+        navigationLoad (navEvent, setup);
         return;
-    }
+    };
+    // expose
+    window.navigationEvent = navigationEvent;
+
+    /**
+     * request the navigation
+     */
+    var navigationLoad = function (navEvent, setup) {
+        if (typeof setup === 'undefined') {
+            alert('error: No navigation setup given, but navigationLoad requested');
+            return;
+        }
+
+        // preparation of a callback function
+        var cbAfterLoad = function(){
+            $.post(navigationExploreUrl, {setup: $.toJSON(setup)},
+                function (data) {
+                    //alert(data);
+                    // only clear when there's no offset
+                    if(typeof setup.state.offset === 'undefined' || setup.state.offset === 0) {
+                        navigationContainer.empty();
+                    } else if (setup.state.lastEvent === 'init') { // remove "show more" button on init event if we have offset
+                        $('a.minibutton', navigationContainer).remove();
+                    }
+                    navigationContainer.append(data);
+                    // remove the processing status
+                    navigationInput.removeClass('is-processing');
 
-    // preparation of a callback function
-    var cbAfterLoad = function(){
-        $.post(navigationExploreUrl, {setup: $.toJSON(setup)},
-            function (data) {
-                //alert(data);
-                navigationContainer.empty();
-                navigationContainer.append(data);
-                // remove the processing status
-                navigationInput.removeClass('is-processing');
-
-                switch (navEvent) {
+                    switch (navEvent) {
                     case 'more':
                         navigationMore.remove();
                         // remove the processing status
@@ -282,20 +288,20 @@ function navigationLoad (navEvent, setup) {
                         navigationContainer.css('marginLeft', '100%');
                         navigationContainer.animate({marginLeft:'0px'},'slow');
                         break;
-                }
+                    }
 
-                navigationPrepareList();
-            }
-        );
-    }
+                    navigationPrepareList();
+                }
+            );
+        };
 
-    // first we set the processing status
-    navigationInput.addClass('is-processing');
-    navigationContainer.css('overflow', 'hidden');
+        // first we set the processing status
+        navigationInput.addClass('is-processing');
+        navigationContainer.css('overflow', 'hidden');
 
-    switch (navEvent) {
+        switch (navEvent) {
         case 'more':
-            navigationMore = $("#naviganion-more");
+            navigationMore = $('#naviganion-more');
             navigationMore.html('&nbsp;&nbsp;&nbsp;&nbsp;');
             navigationMore.addClass('is-processing');
         case 'refresh':
@@ -311,112 +317,117 @@ function navigationLoad (navEvent, setup) {
         default:
             //navigationContainer.slideUp('fast', cbAfterLoad);
             cbAfterLoad();
-    }
+        }
 
-    return ;
-}
+        return ;
+    };
 
-function navigationPrepareToggles(){
-    if (navigationSetup['state']['showHidden'] == true ) {
-        $("a[href='javascript:navigationEvent(\'toggleHidden\')']").text("Hide Hidden Elements");
-    } else {
-        $("a[href='javascript:navigationEvent(\'toggleHidden\')']").text("Show Hidden Elements");
-    }
+    var navigationPrepareToggles = function(){
+        if (navigationSetup.state.showHidden === true ) {
+            $('a[href=\'javascript:navigationEvent(\'toggleHidden\')\']').text('Hide Hidden Elements');
+        } else {
+            $('a[href=\'javascript:navigationEvent(\'toggleHidden\')\']').text('Show Hidden Elements');
+        }
 
-    // if no state is set, use default value from config
-    if (navigationSetup['state']['showEmpty'] == true) {
-        $("a[href='javascript:navigationEvent(\'toggleEmpty\')']").text("Hide Empty Elements");
-    } else {
-        $("a[href='javascript:navigationEvent(\'toggleEmpty\')']").text("Show Empty Elements");
-    }
+        // if no state is set, use default value from config
+        if (navigationSetup.state.showEmpty === true) {
+            $('a[href=\'javascript:navigationEvent(\'toggleEmpty\')\']').text('Hide Empty Elements');
+        } else {
+            $('a[href=\'javascript:navigationEvent(\'toggleEmpty\')\']').text('Show Empty Elements');
+        }
 
-    // if no state is set, use default value from config
-    if (navigationSetup['state']['showImplicit'] == true) {
-        $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Hide Implicit Elements");
-    } else {
-        $("a[href='javascript:navigationEvent(\'toggleImplicit')']").text("Show Implicit Elements");
-    }
-}
+        // if no state is set, use default value from config
+        if (navigationSetup.state.showImplicit === true) {
+            $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Hide Implicit Elements');
+        } else {
+            $('a[href=\'javascript:navigationEvent(\'toggleImplicit\')\']').text('Show Implicit Elements');
+        }
+    };
+
+    /*
+     * This function creates navigation events
+     */
+    var navigationPrepareList = function() {
+        //saveState();
+        // the links to deeper navigation entries
+        $('.navDeeper').click(function(event) {
+            navigationEvent('navigateDeeper', $(this).parent().attr('about'));
+            return false;
+        });
 
-/*
- * This function creates navigation events
- */
-function navigationPrepareList () {
-    //saveState();
-    
-    // the links to deeper navigation entries
-    $('.navDeeper').click(function(event) {
-        navigationEvent('navigateDeeper', $(this).parent().attr('about'));
-        return false;
-    });
+        // the link to the root
+        $('.navFirst').click(function(event){
+            navigationEvent('navigateRoot');
+            return false;
+        });
 
-    // the link to the root
-    $('.navFirst').click(function(event){
-        navigationEvent('navigateRoot');
-        return false;
-    })
-    
-    // the link to higher level
-    $('.navBack').click(function(event){
-        navigationEvent('navigateHigher');
-        return false;
-    })
-
-    // the link to the instance list
-    $('.navList').click(function(event){
-        window.location.href = $(this).attr('href');
-        return false;
-    })
-
-    navigationPrepareToggles();
-}
-
-/*
- * Starts RDFauthor with a specific class init depending on position and config
- */
-function navigationAddElement(){
-    // we use the first configured navigationType to create
-    var classResource = navigationSetup['config']['hierarchyTypes'][0];
-
-    // callback which manipulates the data given from the init json service
-    dataCallback = function(data) {
-        var config = navigationSetup['config']; // configured navigation setup
-        var state = navigationSetup['state']; // current navigation state
-
-        // subjectUri is the main resource
-        for (var newElementUri in data) {break;};
-
-        // check for parent element
-        if (typeof state['parent'] != 'undefined') {
-            var parentUri = state['parent'];
-            var relations = config['hierarchyRelations']; // configured hierarchy relations
-
-            if (typeof relations['in'] != 'undefined') {
-                // check for hierarchy relations (incoming eg. subClassOf)
-                var propertyUri = relations['in'][0]
-
-                // TODO: this should be done by a future RDF/JSON API
-                data[newElementUri][propertyUri] = [ {"type" : "uri" , "value" : parentUri} ];
-            } else if (typeof relations['out'] != 'undefined') {
-                // check for hierarchy relations (outgoing eg. skos:narrower)
-                var propertyUri = relations['out'][0];
-
-                // TODO: this should be done by a future RDF/JSON API
-                var newStatement = {};
-                newStatement[propertyUri] = [{
-                        "hidden": true ,
-                        "type" : "uri" ,
-                        "value" : newElementUri
-                    }];
-                data[parentUri] = newStatement;
+        // the link to higher level
+        $('.navBack').click(function(event){
+            navigationEvent('navigateHigher');
+            return false;
+        });
+
+        // the link to the instance list
+        $('.navList').click(function(event){
+            window.location.href = $(this).attr('href');
+            return false;
+        });
+
+        navigationPrepareToggles();
+    };
+    // expose
+    window.navigationPrepareList = navigationPrepareList;
+
+    /*
+     * Starts RDFauthor with a specific class init depending on position and config
+     */
+    var navigationAddElement = function(){
+        // we use the first configured navigationType to create
+        var classResource = navigationSetup.config.hierarchyTypes[0];
+
+        // callback which manipulates the data given from the init json service
+        dataCallback = function(data) {
+            var config = navigationSetup.config; // configured navigation setup
+            var state = navigationSetup.state; // current navigation state
+
+            // subjectUri is the main resource
+            for (var newElementUri in data) {
+                break;
             }
-        }
 
-        // dont forget to return the manipulated data
-        return data;
-    }
+            // check for parent element
+            if (typeof state.parent !== 'undefined') {
+                var parentUri = state.parent;
+                var relations = config.hierarchyRelations; // configured hierarchy relations
+
+                if (typeof relations.in !== 'undefined') {
+                    // check for hierarchy relations (incoming eg. subClassOf)
+                    var propertyUri = relations.in[0];
+
+                    // TODO: this should be done by a future RDF/JSON API
+                    data[newElementUri][propertyUri] = [ {'type' : 'uri' , 'value' : parentUri} ];
+                } else if (typeof relations.out !== 'undefined') {
+                    // check for hierarchy relations (outgoing eg. skos:narrower)
+                    var propertyUri = relations.out[0];
+
+                    // TODO: this should be done by a future RDF/JSON API
+                    var newStatement = {};
+                    newStatement[propertyUri] = [{
+                            'hidden': true ,
+                            'type' : 'uri' ,
+                            'value' : newElementUri
+                        }];
+                    data[parentUri] = newStatement;
+                }
+            }
+
+            // dont forget to return the manipulated data
+            return data;
+        };
 
-    // start RDFauthor
-    createInstanceFromClassURI(classResource, dataCallback);
-    
-}
+        // start RDFauthor
+        createInstanceFromClassURI(classResource, dataCallback);
+    }
+    // expose
+    window.navigationAddElement = navigationAddElement;
+})();
diff --git a/extensions/pingback/PingbackController.php b/extensions/pingback/PingbackController.php
index d08ca9efa..4ac257d3e 100644
--- a/extensions/pingback/PingbackController.php
+++ b/extensions/pingback/PingbackController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/pingback/PingbackPlugin.php b/extensions/pingback/PingbackPlugin.php
index 51d2a1495..5ed6ddb49 100644
--- a/extensions/pingback/PingbackPlugin.php
+++ b/extensions/pingback/PingbackPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -198,7 +198,7 @@ protected function _checkAndPingback($subject, $predicate, $object)
     protected function _discoverPingbackServer($targetUri)
     {
         // 1. Retrieve HTTP-Header and check for X-Pingback
-        $headers = get_headers($targetUri, 1);
+        $headers = self::_get_headers($targetUri);
         if (!is_array($headers)) {
             return null;
         }
@@ -345,4 +345,41 @@ private function _log($msg)
         $logger->debug($msg);
     }
 
+    /**
+     * This method provides and alternative to PHP's get_headers method, which has no timeout.
+     * It is inspired by: http://snipplr.com/view/61985/
+     */
+    private static function _get_headers($url)
+    {
+        $connection = curl_init();
+
+        $options = array(
+            CURLOPT_URL             => $url,
+            CURLOPT_NOBODY          => true,
+            CURLOPT_HEADER          => true,
+            CURLOPT_TIMEOUT         => 10,
+            CURLOPT_RETURNTRANSFER  => true
+        );
+
+        curl_setopt_array($connection, $options);
+        $result = curl_exec($connection);
+        curl_close($connection);
+
+        if ($result !== false) {
+            $resultArray = explode("\n", $result);
+
+            $header = array();
+            foreach ($resultArray as $headerLine) {
+                $match = preg_match('#(.*?)\:\s(.*)#', $headerLine, $part);
+                if ($match) {
+                    $header[$part[1]] = trim($part[2]);
+                }
+            }
+
+            return $header;
+        } else {
+            return false;
+        }
+    }
+
 }
diff --git a/extensions/pingback/default.ini b/extensions/pingback/default.ini
index b7cf53e44..3852ca5ab 100644
--- a/extensions/pingback/default.ini
+++ b/extensions/pingback/default.ini
@@ -3,7 +3,7 @@
 ;;
 templates  = "templates"
 ;languages  = "languages"
-enabled    = true 
+enabled    = false
 name       = "Pingback Server"
 description = "provides a Semantic Pingback Server and pingback enables all linked data resources"
 author      = "AKSW"
diff --git a/extensions/pingback/doap.n3 b/extensions/pingback/doap.n3
index 111849a23..1426b690f 100644
--- a/extensions/pingback/doap.n3
+++ b/extensions/pingback/doap.n3
@@ -12,7 +12,7 @@
   doap:name "pingback" ;
   owconfig:privateNamespace <https://github.com/AKSW/pingback/raw/master/doap.n3#> ;
   owconfig:templates "templates" ;
-  owconfig:enabled "true"^^xsd:boolean ;
+  owconfig:enabled "false"^^xsd:boolean ;
   rdfs:label "Pingback Server" ;
   doap:description "provides a Semantic Pingback Server and pingback enables all linked data resources" ;
   owconfig:authorLabel "AKSW" ;
diff --git a/extensions/queries/QueriesController.php b/extensions/queries/QueriesController.php
index 014369984..ead13e3dc 100644
--- a/extensions/queries/QueriesController.php
+++ b/extensions/queries/QueriesController.php
@@ -2,8 +2,8 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2013, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
@@ -183,10 +183,11 @@ public function editorAction()
             foreach ($prefixes as $prefix => $namespace) {
                 $prefixString = 'PREFIX ' . $prefix . ': <' . $namespace . '>';
                 // only add prefix if it's not there yet
-                if(strpos($query, $prefixString) === false) {
+                if (strpos($query, $prefixString) === false) {
                     $query = $prefixString . PHP_EOL . $query;
                 }
             }
+
             if ($format == 'list') {
                 $url = new OntoWiki_Url(array('controller' => 'list'), array());
                 $query = str_replace("\r\n", ' ', $query);
@@ -240,7 +241,7 @@ public function editorAction()
                 }
 
                 //this is for the "output to file option
-                if (($format == 'json' || $format == 'xml')
+                if (($format == 'json' || $format == 'xml' || $format == 'csv')
                     && ($this->_request->getParam('result_outputfile') == 'true')
                 ) {
                     $this->_helper->viewRenderer->setNoRender();
@@ -256,6 +257,10 @@ public function editorAction()
                             $contentType = 'application/json';
                             $filename = 'query-result.json';
                             break;
+                        case 'csv':
+                            $contentType = 'text/csv';
+                            $filename = 'query-result.csv';
+                            break;
                     }
 
                     $response->setHeader('Content-Type', $contentType, true);
diff --git a/extensions/queries/QueriesHelper.php b/extensions/queries/QueriesHelper.php
index 118dbd6bb..7330795f5 100644
--- a/extensions/queries/QueriesHelper.php
+++ b/extensions/queries/QueriesHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/queries/SavequeryModule.php b/extensions/queries/SavequeryModule.php
index 708990e74..13b0b60b8 100644
--- a/extensions/queries/SavequeryModule.php
+++ b/extensions/queries/SavequeryModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/queries/resources/querieseditor.css b/extensions/queries/resources/querieseditor.css
index 8ca5f2422..bbe75d108 100644
--- a/extensions/queries/resources/querieseditor.css
+++ b/extensions/queries/resources/querieseditor.css
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 .configModules {
     clear: left;
 }
diff --git a/extensions/queries/resources/savepartial.js b/extensions/queries/resources/savepartial.js
index 9644bc05a..9f3d3bfa3 100644
--- a/extensions/queries/resources/savepartial.js
+++ b/extensions/queries/resources/savepartial.js
@@ -1,74 +1,78 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 $(document).ready(function() {
-		$("#savequerybutton").click(function(){
-		var box = $("#editortype");
-		if(box.val() == "querybuilder"){
-			$.get(urlBase+"querybuilder/updatesparql", {json: $('#hidden_json').val() , limit: $("#limit").val()}, function(query){
-				$.ajax({
-				  url: urlBase + "queries/savequery",
-				  type: "POST",
-				  data: ({
-					json: $('#hidden_json').val(),
-					name: $('#qname').val(),
-					qdesc: $('#qdesc').val(),
-					"query": query,
-					generator: "qb",
-					share: $("#savequerysharecheckbox").is(':checked') ? "true" : "false"
-				  }),
-				  dataType: "text",
-				  success: function(msg){
-					 //TODO check for status
-					 if(msg != "All OK")
-						alert("Fehler "+msg);
-					 //open(urlBase + "querybuilding/listquery");
-				  }
-				});
+    $("#savequerybutton").click(function(){
+    var box = $("#editortype");
+    if(box.val() == "querybuilder"){
+      $.get(urlBase+"querybuilder/updatesparql", {json: $('#hidden_json').val() , limit: $("#limit").val()}, function(query){
+        $.ajax({
+          url: urlBase + "queries/savequery",
+          type: "POST",
+          data: ({
+          json: $('#hidden_json').val(),
+          name: $('#qname').val(),
+          qdesc: $('#qdesc').val(),
+          "query": query,
+          generator: "qb",
+          share: $("#savequerysharecheckbox").is(':checked') ? "true" : "false"
+          }),
+          dataType: "text",
+          success: function(msg){
+           //TODO check for status
+           if(msg != "All OK")
+            alert("Fehler "+msg);
+           //open(urlBase + "querybuilding/listquery");
+          }
+        });
 
-			});
+      });
 
-		} else if(box.val() == "graphicalquerybuilder"){
-			if (!GQB.view.selectedViewClass) {alert(GQB.translate("noPatternSelMsg"));return;}
-			var modelPattern = GQB.view.selectedViewClass.parentViewPattern.modelPattern;
-			if (!modelPattern) return;  // sollte nicht passieren, ist schwerer Fehler
-			modelPattern.name = $('#qname').val();
-			modelPattern.description= $('#qdesc').val();
-			modelPattern.save();
+    } else if(box.val() == "graphicalquerybuilder"){
+      if (!GQB.view.selectedViewClass) {alert(GQB.translate("noPatternSelMsg"));return;}
+      var modelPattern = GQB.view.selectedViewClass.parentViewPattern.modelPattern;
+      if (!modelPattern) return;  // sollte nicht passieren, ist schwerer Fehler
+      modelPattern.name = $('#qname').val();
+      modelPattern.description= $('#qdesc').val();
+      modelPattern.save();
 
-		} else if(box.val() == "queryeditor"){
-			$.ajax({
-				  url: urlBase + "queries/savequery",
-				  type: "POST",
-				  data: ({
-					json: "",
-					name: $('#qname').val(),
-					"query": editor.getValue(),
-					generator: "qe",
-					//share: $("#savequerysharecheckbox").is(':checked') ? "true" : "false"
-					share: "true"
-				  }),
-				  dataType: "text",
-							  error: function(xmlHttpObj, type, error){
-								  alert ("error");
-							  },
-				  success: function(msg){
-					 //TODO check for status
-					 if (msg != "All OK") {
-						alert("Fehler " + msg);
-					 } else {
-						$('.innercontent').prepend("<p class=\"messagebox info\" id=\"savequerynotification\">The Query was saved</p>");
-						
-						setTimeout(function (){
-							$("#savequerynotification").remove();
-						}, 5000);
-					 }
-					 //open(urlBase + "querybuilding/listquery");
-				  }
-				});
-		} else {
-			alert("error: dont know which builder this is");
-		}
-		
-		
-	
-	});
-	$('#qname').innerLabel();
+    } else if(box.val() == "queryeditor"){
+      $.ajax({
+          url: urlBase + "queries/savequery",
+          type: "POST",
+          data: ({
+          json: "",
+          name: $('#qname').val(),
+          "query": editor.getValue(),
+          generator: "qe",
+          //share: $("#savequerysharecheckbox").is(':checked') ? "true" : "false"
+          share: "true"
+          }),
+          dataType: "text",
+                error: function(xmlHttpObj, type, error){
+                  alert ("error");
+                },
+          success: function(msg){
+           //TODO check for status
+           if (msg != "All OK") {
+            alert("Fehler " + msg);
+           } else {
+            $('.innercontent').prepend("<p class=\"messagebox info\" id=\"savequerynotification\">The Query was saved</p>");
+            
+            setTimeout(function (){
+              $("#savequerynotification").remove();
+            }, 5000);
+           }
+           //open(urlBase + "querybuilding/listquery");
+          }
+        });
+    } else {
+      alert("error: dont know which builder this is");
+    }
+    
+    
+  
+  });
+  $('#qname').innerLabel();
 });
\ No newline at end of file
diff --git a/extensions/queries/templates/queries/editor.phtml b/extensions/queries/templates/queries/editor.phtml
index ece706de3..5cb4e27b2 100644
--- a/extensions/queries/templates/queries/editor.phtml
+++ b/extensions/queries/templates/queries/editor.phtml
@@ -20,12 +20,12 @@ if (isset($this->errorFlag) && $this->errorFlag !== false) {
 <input id="editortype" type="hidden" value="queryeditor" />
 <div class="configMmodules">
 <div class="width49 float margin">
-<strong><?= $this->_('Output Format') ?></strong>
-<?= $this->render('sparqloptions.phtml') ?>
+<strong><?php echo $this->_('Output Format') ?></strong>
+<?php echo $this->render('sparqloptions.phtml') ?>
 </div>
 <div class="width49 float margin">
-<strong><?= $this->_('Query Source') ?></strong>
-<?= $this->render('queryeditorfromsetter.phtml') ?>
+<strong><?php echo $this->_('Query Source') ?></strong>
+<?php echo $this->render('queryeditorfromsetter.phtml') ?>
 </div>
 </div>
 <p class="messagebox info"><?php echo $this->_('Predefined namespaces') ?>:
@@ -44,7 +44,7 @@ if (isset($this->errorFlag) && $this->errorFlag !== false) {
     </div>
 <?php if ($this->has('error')): ?>
     <fieldset>
-        <div class="messagebox error"><?php echo $this->error ?></div>
+        <div class="messagebox error"><?php echo nl2br($this->escape($this->error)) ?></div>
     </fieldset>
 <?php endif; ?>
 
diff --git a/extensions/queries/templates/sparqloptions.phtml b/extensions/queries/templates/sparqloptions.phtml
index c3d0fe406..2c0002452 100644
--- a/extensions/queries/templates/sparqloptions.phtml
+++ b/extensions/queries/templates/sparqloptions.phtml
@@ -35,6 +35,13 @@
     />
     <label for="result_format_json" class="checkboxradio"><a href="http://www.w3.org/TR/rdf-sparql-json-res/">JSON</a></label>
     <br class="clearall">
+    <input type="radio" class="radio" name="result_format" id="result_format_csv" value="csv"
+    <?php if ($this->placeholder('sparql.result.format') == 'csv'): ?>
+        <?php echo ' checked="checked"' ?>
+    <?php endif; ?>
+    />
+    <label for="result_format_csv" class="checkboxradio"><a href="http://www.w3.org/TR/sparql11-results-csv-tsv/">CSV</a></label>
+    <br class="clearall">
     <input type="checkbox" class="checkbox" name="result_outputfile" id="result_outputfile" value="true"
     <?php if ($this->placeholder('sparql.result.file') == 'true'): ?>
         <?php echo ' checked="checked"' ?>
diff --git a/extensions/resourcecreationuri/ResourcecreationuriPlugin.php b/extensions/resourcecreationuri/ResourcecreationuriPlugin.php
index 47fdfcd65..8c4b24ab5 100644
--- a/extensions/resourcecreationuri/ResourcecreationuriPlugin.php
+++ b/extensions/resourcecreationuri/ResourcecreationuriPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/resourcecreationuri/classes/ResourceUriGenerator.php b/extensions/resourcecreationuri/classes/ResourceUriGenerator.php
index d663ca4b6..02677842f 100644
--- a/extensions/resourcecreationuri/classes/ResourceUriGenerator.php
+++ b/extensions/resourcecreationuri/classes/ResourceUriGenerator.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/resourcemodules/LinkinghereModule.php b/extensions/resourcemodules/LinkinghereModule.php
index 1247b8c5b..7399694b1 100644
--- a/extensions/resourcemodules/LinkinghereModule.php
+++ b/extensions/resourcemodules/LinkinghereModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -28,7 +28,7 @@ public function init()
     {
         $query = new Erfurt_Sparql_SimpleQuery();
 
-        $query->setProloguePart('SELECT DISTINCT ?subject ?uri')
+        $query->setSelectClause('SELECT DISTINCT ?subject ?uri')
             ->setWherePart(
                 'WHERE {
                     ?subject ?uri <' . (string)$this->_owApp->selectedResource . '> .
@@ -91,7 +91,7 @@ public function getContents()
             $properties[$predicateUri]['title'] = $titleHelper->getTitle($predicateUri, $this->_lang);
 
             $query->resetInstance()
-                ->setProloguePart('SELECT DISTINCT ?uri')
+                ->setSelectClause('SELECT DISTINCT ?uri')
                 ->setWherePart(
                     'WHERE {
                         ?uri <' . $predicateUri . '> <' . (string)$this->_owApp->selectedResource . '> .
@@ -154,5 +154,3 @@ public function getStateId()
         return $id;
     }
 }
-
-
diff --git a/extensions/resourcemodules/SimilarinstancesModule.php b/extensions/resourcemodules/SimilarinstancesModule.php
index b9468e2d1..c841a8f8d 100644
--- a/extensions/resourcemodules/SimilarinstancesModule.php
+++ b/extensions/resourcemodules/SimilarinstancesModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -54,7 +54,7 @@ public function getContents()
             }
 
             $query->resetInstance()
-                ->setProloguePart('SELECT DISTINCT ?uri')
+                ->setSelectClause('SELECT DISTINCT ?uri')
                 ->setWherePart(
                     'WHERE {
                         ?uri a <' . $typeUri . '> .
@@ -137,7 +137,7 @@ private function _getTypes()
 
         $query = new Erfurt_Sparql_SimpleQuery();
 
-        $query->setProloguePart('SELECT DISTINCT ?uri')
+        $query->setSelectClause('SELECT DISTINCT ?uri')
             ->setWherePart(
                 'WHERE {
                     <' . (string)$this->_owApp->selectedResource . '> a ?uri.
@@ -163,5 +163,3 @@ private function _getTypes()
         return array_keys($typesInferred);
     }
 }
-
-
diff --git a/extensions/resourcemodules/UsageModule.php b/extensions/resourcemodules/UsageModule.php
index 94c8feaad..ce518a2ac 100644
--- a/extensions/resourcemodules/UsageModule.php
+++ b/extensions/resourcemodules/UsageModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -44,7 +44,7 @@ private function _initQuery()
     {
         // instances (subjects)
         $this->_subjectQuery = new Erfurt_Sparql_SimpleQuery();
-        $this->_subjectQuery->setProloguePart('SELECT DISTINCT ?resourceUri')
+        $this->_subjectQuery->setSelectClause('SELECT DISTINCT ?resourceUri')
             ->setWherePart(
                 'WHERE { ?resourceUri <' . (string)$this->_owApp->selectedResource . '> ?object . ' .
                 'FILTER (isURI(?resourceUri)) }'
@@ -54,7 +54,7 @@ private function _initQuery()
 
         // objects
         $this->_objectQuery = new Erfurt_Sparql_SimpleQuery();
-        $this->_objectQuery->setProloguePart('SELECT DISTINCT ?resourceUri')
+        $this->_objectQuery->setSelectClause('SELECT DISTINCT ?resourceUri')
             ->setWherePart(
                 'WHERE { ?subject <' . (string)$this->_owApp->selectedResource . '> ?resourceUri . ' .
                 'FILTER (isURI(?resourceUri)) }'
@@ -169,5 +169,3 @@ public function getStateId()
         return $id;
     }
 }
-
-
diff --git a/extensions/savedqueries/SavedqueriesController.php b/extensions/savedqueries/SavedqueriesController.php
index 9d231c378..a168b3352 100644
--- a/extensions/savedqueries/SavedqueriesController.php
+++ b/extensions/savedqueries/SavedqueriesController.php
@@ -2,12 +2,10 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
-require_once 'OntoWiki/Controller/Component.php';
-
 /**
  * Mass Geocoding of Ressources via attributes (parameter r)
  *
@@ -32,14 +30,12 @@ public function init()
         parent::init();
         // m is automatically used and selected
         if ((!isset($this->_request->m)) && (!$this->_owApp->selectedModel)) {
-            require_once 'OntoWiki/Exception.php';
             throw new OntoWiki_Exception('No model pre-selected and missing parameter m (model)!');
         } else {
             $this->_model = $this->_owApp->selectedModel;
         }
 
         // disable tabs
-        require_once 'OntoWiki/Navigation.php';
         OntoWiki::getInstance()->getNavigation()->disableNavigation();
 
         // get translation object
@@ -61,11 +57,18 @@ public function init()
     public function initAction()
     {
         // create a new button on the toolbar
-        $queryResult = $this->_getQueryResult($this->queryString);
-
+        try {
+            $queryResult = $this->_getQueryResult($this->queryString);
+        } catch (Exception $e){
+            $queryResult = array(
+                array(
+                    "error" => "This Query contains errors and should be corrected in the Query Editor",
+                    ),
+                );
+        }
         $header = array();
         try {
-            if (is_array($queryResult) && isset ($queryResult[0]) && is_array($queryResult[0])) {
+            if (is_array($queryResult) && isset($queryResult[0]) && is_array($queryResult[0])) {
                 $header = array_keys($queryResult[0]);
             } else {
                 if (is_bool($queryResult)) {
diff --git a/extensions/savedqueries/SavedqueriesModule.php b/extensions/savedqueries/SavedqueriesModule.php
index e6729aac8..29bf543dd 100644
--- a/extensions/savedqueries/SavedqueriesModule.php
+++ b/extensions/savedqueries/SavedqueriesModule.php
@@ -2,15 +2,10 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
-require_once 'Erfurt/Sparql/SimpleQuery.php';
-require_once 'OntoWiki/Module.php';
-require_once 'OntoWiki/Url.php';
-require_once 'OntoWiki/Utils.php';
-
 /**
  * @category   OntoWiki
  * @package    Extensions_Savedqueries
@@ -38,8 +33,8 @@ public function getContents()
                 ?query a <" . $this->_privateConfig->queryClass . "> .
                 ?query <" . $this->_privateConfig->queryLabel . "> ?label .
                 ?query <" . $this->_privateConfig->queryId . "> ?id .
-                ?query <" . $this->_privateConfig->queryDesc . "> ?description .
-                ?query <" . $this->_privateConfig->queryCode . "> ?code
+                ?query <" . $this->_privateConfig->queryCode . "> ?code.
+                OPTIONAL { ?query <" . $this->_privateConfig->queryDesc . "> ?description . }
         }";
 
         $elements = $storeGraph->sparqlQuery($query);
diff --git a/extensions/savedqueries/templates/savedqueries/init.phtml b/extensions/savedqueries/templates/savedqueries/init.phtml
index 9a95ef951..83a8d5d33 100644
--- a/extensions/savedqueries/templates/savedqueries/init.phtml
+++ b/extensions/savedqueries/templates/savedqueries/init.phtml
@@ -2,7 +2,7 @@
     <fieldset>
         <?php if (is_array($this->queryResult)): ?>
             <?php 
-               	echo $this->partial('partials/resultset.phtml', array('data' => $this->queryResult, 'header' => $this->header, 'caption'=>'')); 
+               	echo $this->partial('partials/resultset.phtml', array('data' => $this->queryResult, 'urlBase' => $this->urlBase, 'header' => $this->header, 'caption'=>'')); 
             ?>
         <?php else: ?>
             <pre><?php echo $this->escape($this->queryResult) ?></pre>
diff --git a/extensions/selectlanguage/SelectlanguagePlugin.php b/extensions/selectlanguage/SelectlanguagePlugin.php
index 263d0da1e..bc030f1fd 100644
--- a/extensions/selectlanguage/SelectlanguagePlugin.php
+++ b/extensions/selectlanguage/SelectlanguagePlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/selectlanguage/default.ini b/extensions/selectlanguage/default.ini
index 53f803758..478185ade 100644
--- a/extensions/selectlanguage/default.ini
+++ b/extensions/selectlanguage/default.ini
@@ -10,6 +10,7 @@ author      = "Michael Martin"
 [private]
 languages.en = "english (en)"
 languages.de = "deutsch (de)"
+languages.hu = "magyar (hu)"
 languages.zh = "汉语 (zh)"
-langzages.ru = "русский язык (ru)"
+languages.ru = "русский язык (ru)"
 ;languages.nl = dutch
diff --git a/extensions/selectlanguage/doap.n3 b/extensions/selectlanguage/doap.n3
index af837cc2f..223bd8ebe 100644
--- a/extensions/selectlanguage/doap.n3
+++ b/extensions/selectlanguage/doap.n3
@@ -20,13 +20,11 @@
   owconfig:config [
       a owconfig:Config;
       owconfig:id "languages";
-      :en "english (en)" ;
-      :de "deutsch (de)" ;
-      :zh "汉语 (zh)"
-];
- owconfig:config [
-      a owconfig:Config;
-      owconfig:id "langzages";
+      :en "English (en)" ;
+      :de "Deutsch (de)" ;
+      :fr "Français (fr)" ;
+      :hu "Magyar (hu)" ;
+      :zh "汉语 (zh)" ;
       :ru "русский язык (ru)"
 ] .
 :selectlanguage doap:release :v1-0 .
diff --git a/extensions/semanticsitemap/SemanticsitemapController.php b/extensions/semanticsitemap/SemanticsitemapController.php
index 35cc92b22..97eb8d42f 100644
--- a/extensions/semanticsitemap/SemanticsitemapController.php
+++ b/extensions/semanticsitemap/SemanticsitemapController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -61,14 +61,14 @@ public function sitemapAction()
         // these dataset items are used by the template
         $datasets = array();
         foreach ($this->_models as $modelUri => $model) {
+            $dataDump = $owApp->config->urlBase . 'model/export?output=xml&amp;m=' . urlencode($modelUri);
             $datasets[] = array(
                 'datasetURI'             => $modelUri,
                 'datasetLabel'           => $this->_store->getModel($modelUri)->getTitle(),
                 'sparqlEndpoint'         => $owApp->config->urlBase . 'service/sparql',
                 'sparqlGraphName'        => $modelUri,
                 'sparqlEndpointLocation' => $owApp->config->urlBase . 'service/sparql',
-                'dataDump'               =>
-                $owApp->config->urlBase . 'model/export?output=xml&amp;m=' . urlencode($modelUri)
+                'dataDump'               => $dataDump
             );
         }
 
diff --git a/extensions/semanticsitemap/semanticsitemap.php b/extensions/semanticsitemap/semanticsitemap.php
index ea2eb9142..2876c82bc 100644
--- a/extensions/semanticsitemap/semanticsitemap.php
+++ b/extensions/semanticsitemap/semanticsitemap.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/sendmail/SendmailPlugin.php b/extensions/sendmail/SendmailPlugin.php
index 6d852e3f6..7134442b5 100644
--- a/extensions/sendmail/SendmailPlugin.php
+++ b/extensions/sendmail/SendmailPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/sindice/SindicePlugin.php b/extensions/sindice/SindicePlugin.php
index 89b8482de..9dee2c65f 100644
--- a/extensions/sindice/SindicePlugin.php
+++ b/extensions/sindice/SindicePlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/sortproperties/SortpropertiesPlugin.php b/extensions/sortproperties/SortpropertiesPlugin.php
index 65e15d741..0d96781ab 100644
--- a/extensions/sortproperties/SortpropertiesPlugin.php
+++ b/extensions/sortproperties/SortpropertiesPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -25,7 +25,7 @@ public function onPropertiesActionData($event)
 
             foreach ($data as $graphUri => $predicates) {
                 $query = new Erfurt_Sparql_SimpleQuery();
-                $query->setProloguePart('SELECT DISTINCT *')
+                $query->setSelectClause('SELECT DISTINCT *')
                     ->addFrom((string)$graphUri)
                     ->setWherePart('WHERE { ?p <' . $this->_privateConfig->sort->property . '> ?o . }');
 
@@ -49,7 +49,7 @@ public function onPropertiesActionData($event)
                         }
                     }
 
-                    array_multisort($predicateOrder, SORT_DESC, SORT_STRING, $predicates);
+                    array_multisort($predicateOrder, SORT_DESC, SORT_NUMERIC, $predicates);
                     $data[$graphUri] = $predicates;
 
                 }
diff --git a/extensions/source/SourceController.php b/extensions/source/SourceController.php
index 032edff32..d3245bc3f 100644
--- a/extensions/source/SourceController.php
+++ b/extensions/source/SourceController.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2006-2013, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2006-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -27,9 +27,11 @@ public function editAction()
             );
             $title = 'RDF Source';
         } else {
-            $title = $resource->getTitle()
-                ? $resource->getTitle()
-                : OntoWiki_Utils::contractNamespace($resource->getIri());
+            if ($resource->getTitle()) {
+                $title = $resource->getTitle();
+            } else {
+                $title = OntoWiki_Utils::contractNamespace($resource->getIri());
+            }
         }
         $windowTitle = sprintf(
             $translate->_('Source of Statements about %1$s') .
diff --git a/extensions/source/SourceHelper.php b/extensions/source/SourceHelper.php
index ad0314901..8f8e664b0 100644
--- a/extensions/source/SourceHelper.php
+++ b/extensions/source/SourceHelper.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/extensions/themes/darkorange/styles/default.css b/extensions/themes/darkorange/styles/default.css
index 02405b86a..6486cdd49 100644
--- a/extensions/themes/darkorange/styles/default.css
+++ b/extensions/themes/darkorange/styles/default.css
@@ -3,8 +3,10 @@
  * OntoWiki Extra Styles
  * DARK ORANGE
  *
- * @depends OntoWiki Silverblue Theme
- * @author http://michael.haschke.biz/
+ * @depends   OntoWiki Silverblue Theme
+ * @author    http://michael.haschke.biz/
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  *
  *************************************************************************/
 
diff --git a/extensions/themes/silverblue/sandbox/detailview.html b/extensions/themes/silverblue/sandbox/detailview.html
index c10c8bef9..3345941c1 100644
--- a/extensions/themes/silverblue/sandbox/detailview.html
+++ b/extensions/themes/silverblue/sandbox/detailview.html
@@ -15,8 +15,8 @@
 </script>
 
     <!-- jQuery -->
-    <script type="text/javascript" src="./../scripts/libraries/jquery.js"></script>
-    <script type="text/javascript" src="./../scripts/libraries/jquery-ui.js"></script>
+    <script type="text/javascript" src="./../scripts/libraries/jquery-1.9.1.js"></script>
+    <script type="text/javascript" src="./../scripts/libraries/jquery-ui-1.8.22.js"></script>
 
     <!-- included js libraries -->
     <script type="text/javascript" src="./../scripts/libraries/jquery.json.js"></script>
diff --git a/extensions/themes/silverblue/sandbox/listview.html b/extensions/themes/silverblue/sandbox/listview.html
index 612833994..69ba01547 100644
--- a/extensions/themes/silverblue/sandbox/listview.html
+++ b/extensions/themes/silverblue/sandbox/listview.html
@@ -15,8 +15,8 @@
 </script>
 
     <!-- jQuery -->
-    <script type="text/javascript" src="./../scripts/libraries/jquery.js"></script>
-    <script type="text/javascript" src="./../scripts/libraries/jquery-ui.js"></script>
+    <script type="text/javascript" src="./../scripts/libraries/jquery-1.9.1.js"></script>
+    <script type="text/javascript" src="./../scripts/libraries/jquery-ui-1.8.22.js"></script>
 
     <!-- included js libraries -->
     <script type="text/javascript" src="./../scripts/libraries/jquery.json.js"></script>
diff --git a/extensions/themes/silverblue/sandbox/uitest.html b/extensions/themes/silverblue/sandbox/uitest.html
index 233eb28d4..0d539fe42 100644
--- a/extensions/themes/silverblue/sandbox/uitest.html
+++ b/extensions/themes/silverblue/sandbox/uitest.html
@@ -7,8 +7,8 @@
 <meta name="generator" content="OntoWiki — Collaborative Knowledge Engineering" />
 <link rel="stylesheet" href="./../styles/default.css" type="text/css" media="screen" />
 <!-- jQuery -->
-<script type="text/javascript" src="./../scripts/libraries/jquery.js"></script>
-<script type="text/javascript" src="./../scripts/libraries/jquery-ui.js"></script>
+<script type="text/javascript" src="./../scripts/libraries/jquery-1.9.1.js"></script>
+<script type="text/javascript" src="./../scripts/libraries/jquery-ui-1.8.22.js"></script>
 <script type="text/javascript">
     $(document).ready(function() {
         $('#button-tests button, #button-tests input, #button-tests a').button().click(function(){ $('#dialog-test').dialog('open'); });
@@ -73,4 +73,4 @@ <h3>Three</h3>
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/extensions/themes/silverblue/sandbox/uitestow.html b/extensions/themes/silverblue/sandbox/uitestow.html
index 86ab6ee5c..a978a5199 100644
--- a/extensions/themes/silverblue/sandbox/uitestow.html
+++ b/extensions/themes/silverblue/sandbox/uitestow.html
@@ -15,8 +15,8 @@
 </script>
 
     <!-- jQuery -->
-    <script type="text/javascript" src="./../scripts/libraries/jquery.js"></script>
-    <script type="text/javascript" src="./../scripts/libraries/jquery-ui.js"></script>
+    <script type="text/javascript" src="./../scripts/libraries/jquery-1.9.1.js"></script>
+    <script type="text/javascript" src="./../scripts/libraries/jquery-ui-1.8.22.js"></script>
 
     <!-- included js libraries -->
     <script type="text/javascript" src="./../scripts/libraries/jquery.json.js"></script>
diff --git a/extensions/themes/silverblue/scripts/libraries/jquery-1.9.1.js b/extensions/themes/silverblue/scripts/libraries/jquery-1.9.1.js
new file mode 100644
index 000000000..e2c203fe9
--- /dev/null
+++ b/extensions/themes/silverblue/scripts/libraries/jquery-1.9.1.js
@@ -0,0 +1,9597 @@
+/*!
+ * jQuery JavaScript Library v1.9.1
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2013-2-4
+ */
+(function( window, undefined ) {
+
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+// Support: Firefox 18+
+//"use strict";
+var
+	// The deferred used on DOM ready
+	readyList,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// Support: IE<9
+	// For `typeof node.method` instead of `node.method !== undefined`
+	core_strundefined = typeof undefined,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+	location = window.location,
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// [[Class]] -> type pairs
+	class2type = {},
+
+	// List of deleted data cache ids, so we can reuse them
+	core_deletedIds = [],
+
+	core_version = "1.9.1",
+
+	// Save a reference to some core methods
+	core_concat = core_deletedIds.concat,
+	core_push = core_deletedIds.push,
+	core_slice = core_deletedIds.slice,
+	core_indexOf = core_deletedIds.indexOf,
+	core_toString = class2type.toString,
+	core_hasOwn = class2type.hasOwnProperty,
+	core_trim = core_version.trim,
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Used for matching numbers
+	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+
+	// Used for splitting on whitespace
+	core_rnotwhite = /\S+/g,
+
+	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	},
+
+	// The ready event handler
+	completed = function( event ) {
+
+		// readyState === "complete" is good enough for us to call the dom ready in oldIE
+		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
+			detach();
+			jQuery.ready();
+		}
+	},
+	// Clean-up method for dom ready events
+	detach = function() {
+		if ( document.addEventListener ) {
+			document.removeEventListener( "DOMContentLoaded", completed, false );
+			window.removeEventListener( "load", completed, false );
+
+		} else {
+			document.detachEvent( "onreadystatechange", completed );
+			window.detachEvent( "onload", completed );
+		}
+	};
+
+jQuery.fn = jQuery.prototype = {
+	// The current version of jQuery being used
+	jquery: core_version,
+
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+
+					// scripts is true for back-compat
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return core_slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+		ret.context = this.context;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Add the callback
+		jQuery.ready.promise().done( fn );
+
+		return this;
+	},
+
+	slice: function() {
+		return this.pushStack( core_slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: core_push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var src, copyIsArray, copy, name, options, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
+
+		if ( deep && window.jQuery === jQuery ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( !document.body ) {
+			return setTimeout( jQuery.ready );
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+
+		// Trigger any bound ready events
+		if ( jQuery.fn.trigger ) {
+			jQuery( document ).trigger("ready").off("ready");
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		return !isNaN( parseFloat(obj) ) && isFinite( obj );
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return String( obj );
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ core_toString.call(obj) ] || "object" :
+			typeof obj;
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!core_hasOwn.call(obj, "constructor") &&
+				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || core_hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	// data: string of html
+	// context (optional): If specified, the fragment will be created in this context, defaults to document
+	// keepScripts (optional): If true, will include scripts passed in the html string
+	parseHTML: function( data, context, keepScripts ) {
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		if ( typeof context === "boolean" ) {
+			keepScripts = context;
+			context = false;
+		}
+		context = context || document;
+
+		var parsed = rsingleTag.exec( data ),
+			scripts = !keepScripts && [];
+
+		// Single tag
+		if ( parsed ) {
+			return [ context.createElement( parsed[1] ) ];
+		}
+
+		parsed = jQuery.buildFragment( [ data ], context, scripts );
+		if ( scripts ) {
+			jQuery( scripts ).remove();
+		}
+		return jQuery.merge( [], parsed.childNodes );
+	},
+
+	parseJSON: function( data ) {
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		if ( data === null ) {
+			return data;
+		}
+
+		if ( typeof data === "string" ) {
+
+			// Make sure leading/trailing whitespace is removed (IE can't handle it)
+			data = jQuery.trim( data );
+
+			if ( data ) {
+				// Make sure the incoming data is actual JSON
+				// Logic borrowed from http://json.org/json2.js
+				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+					.replace( rvalidtokens, "]" )
+					.replace( rvalidbraces, "")) ) {
+
+					return ( new Function( "return " + data ) )();
+				}
+			}
+		}
+
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		var xml, tmp;
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && jQuery.trim( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	// args is for internal usage only
+	each: function( obj, callback, args ) {
+		var value,
+			i = 0,
+			length = obj.length,
+			isArray = isArraylike( obj );
+
+		if ( args ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
+		function( text ) {
+			return text == null ?
+				"" :
+				core_trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				( text + "" ).replace( rtrim, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArraylike( Object(arr) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				core_push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		var len;
+
+		if ( arr ) {
+			if ( core_indexOf ) {
+				return core_indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var l = second.length,
+			i = first.length,
+			j = 0;
+
+		if ( typeof l === "number" ) {
+			for ( ; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var retVal,
+			ret = [],
+			i = 0,
+			length = elems.length;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value,
+			i = 0,
+			length = elems.length,
+			isArray = isArraylike( elems ),
+			ret = [];
+
+		// Go through the array, translating each of the items to their
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return core_concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var args, proxy, tmp;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = core_slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	// Multifunctional method to get and set values of a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
+		var i = 0,
+			length = elems.length,
+			bulk = key == null;
+
+		// Sets many values
+		if ( jQuery.type( key ) === "object" ) {
+			chainable = true;
+			for ( i in key ) {
+				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+			}
+
+		// Sets one value
+		} else if ( value !== undefined ) {
+			chainable = true;
+
+			if ( !jQuery.isFunction( value ) ) {
+				raw = true;
+			}
+
+			if ( bulk ) {
+				// Bulk operations run against the entire set
+				if ( raw ) {
+					fn.call( elems, value );
+					fn = null;
+
+				// ...except when executing function values
+				} else {
+					bulk = fn;
+					fn = function( elem, key, value ) {
+						return bulk.call( jQuery( elem ), value );
+					};
+				}
+			}
+
+			if ( fn ) {
+				for ( ; i < length; i++ ) {
+					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+				}
+			}
+		}
+
+		return chainable ?
+			elems :
+
+			// Gets
+			bulk ?
+				fn.call( elems ) :
+				length ? fn( elems[0], key ) : emptyGet;
+	},
+
+	now: function() {
+		return ( new Date() ).getTime();
+	}
+});
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called after the browser event has already occurred.
+		// we once tried to use readyState "interactive" here, but it caused issues like the one
+		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed, false );
+
+		// If IE event model is used
+		} else {
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch(e) {}
+
+			if ( top && top.doScroll ) {
+				(function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll("left");
+						} catch(e) {
+							return setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				})();
+			}
+		}
+	}
+	return readyList.promise( obj );
+};
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+	var length = obj.length,
+		type = jQuery.type( obj );
+
+	if ( jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	if ( obj.nodeType === 1 && length ) {
+		return true;
+	}
+
+	return type === "array" || type !== "function" &&
+		( length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
+
+	var // Flag to know if list is currently firing
+		firing,
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "string" ) {
+								// Inspect recursively
+								add( arg );
+							}
+						});
+					})( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away
+					} else if ( memory ) {
+						firingStart = start;
+						fire( memory );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					jQuery.each( arguments, function( _, arg ) {
+						var index;
+						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+							list.splice( index, 1 );
+							// Handle firing indexes
+							if ( firing ) {
+								if ( index <= firingLength ) {
+									firingLength--;
+								}
+								if ( index <= firingIndex ) {
+									firingIndex--;
+								}
+							}
+						}
+					});
+				}
+				return this;
+			},
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				args = args || [];
+				args = [ context, args.slice ? args.slice() : args ];
+				if ( list && ( !fired || stack ) ) {
+					if ( firing ) {
+						stack.push( args );
+					} else {
+						fire( args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var tuples = [
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory") ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var action = tuple[ 0 ],
+								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[1] ](function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.done( newDefer.resolve )
+										.fail( newDefer.reject )
+										.progress( newDefer.notify );
+								} else {
+									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+								}
+							});
+						});
+						fns = null;
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[1] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(function() {
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[0] ] = function() {
+				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+				return this;
+			};
+			deferred[ tuple[0] + "With" ] = list.fireWith;
+		});
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = core_slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
+					if( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+					} else if ( !( --remaining ) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject )
+						.progress( updateFunc( i, progressContexts, progressValues ) );
+				} else {
+					--remaining;
+				}
+			}
+		}
+
+		// if we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
+	}
+});
+jQuery.support = (function() {
+
+	var support, all, a,
+		input, select, fragment,
+		opt, eventName, isSupported, i,
+		div = document.createElement("div");
+
+	// Setup
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// Support tests won't run in some limited or non-browser environments
+	all = div.getElementsByTagName("*");
+	a = div.getElementsByTagName("a")[ 0 ];
+	if ( !all || !a || !all.length ) {
+		return {};
+	}
+
+	// First batch of tests
+	select = document.createElement("select");
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName("input")[ 0 ];
+
+	a.style.cssText = "top:1px;float:left;opacity:.5";
+	support = {
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
+
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType === 3,
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.5/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+		checkOn: !!input.value,
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Tests for enctype support on a form (#6743)
+		enctype: !!document.createElement("form").enctype,
+
+		// Makes sure cloning an html5 element does not cause problems
+		// Where outerHTML is undefined, this still works
+		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
+
+		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
+		boxModel: document.compatMode === "CSS1Compat",
+
+		// Will be defined later
+		deleteExpando: true,
+		noCloneEvent: true,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true,
+		boxSizingReliable: true,
+		pixelPosition: false
+	};
+
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE<9
+	try {
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
+	}
+
+	// Check if we can trust getAttribute("value")
+	input = document.createElement("input");
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
+
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	input.setAttribute( "checked", "t" );
+	input.setAttribute( "name", "t" );
+
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( input );
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<9
+	// Opera does not clone events (and typeof div.attachEvent === undefined).
+	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+	if ( div.attachEvent ) {
+		div.attachEvent( "onclick", function() {
+			support.noCloneEvent = false;
+		});
+
+		div.cloneNode( true ).click();
+	}
+
+	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
+	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
+	for ( i in { submit: true, change: true, focusin: true }) {
+		div.setAttribute( eventName = "on" + i, "t" );
+
+		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
+	}
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	// Run tests that need a body at doc ready
+	jQuery(function() {
+		var container, marginDiv, tds,
+			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
+			body = document.getElementsByTagName("body")[0];
+
+		if ( !body ) {
+			// Return for frameset docs that don't have a body
+			return;
+		}
+
+		container = document.createElement("div");
+		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+
+		body.appendChild( container ).appendChild( div );
+
+		// Support: IE8
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+		tds = div.getElementsByTagName("td");
+		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
+		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+		tds[ 0 ].style.display = "";
+		tds[ 1 ].style.display = "none";
+
+		// Support: IE8
+		// Check if empty table cells still have offsetWidth/Height
+		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+		// Check box-sizing and margin behavior
+		div.innerHTML = "";
+		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
+		support.boxSizing = ( div.offsetWidth === 4 );
+		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
+
+		// Use window.getComputedStyle because jsdom on node.js will break without it.
+		if ( window.getComputedStyle ) {
+			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+			// Check if div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container. (#3333)
+			// Fails in WebKit before Feb 2011 nightlies
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			marginDiv = div.appendChild( document.createElement("div") );
+			marginDiv.style.cssText = div.style.cssText = divReset;
+			marginDiv.style.marginRight = marginDiv.style.width = "0";
+			div.style.width = "1px";
+
+			support.reliableMarginRight =
+				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+		}
+
+		if ( typeof div.style.zoom !== core_strundefined ) {
+			// Support: IE<8
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			div.innerHTML = "";
+			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+			// Support: IE6
+			// Check if elements with layout shrink-wrap their children
+			div.style.display = "block";
+			div.innerHTML = "<div></div>";
+			div.firstChild.style.width = "5px";
+			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+
+			if ( support.inlineBlockNeedsLayout ) {
+				// Prevent IE 6 from affecting layout for positioned elements #11048
+				// Prevent IE from shrinking the body in IE 7 mode #12869
+				// Support: IE<8
+				body.style.zoom = 1;
+			}
+		}
+
+		body.removeChild( container );
+
+		// Null elements to avoid leaks in IE
+		container = div = tds = marginDiv = null;
+	});
+
+	// Null elements to avoid leaks in IE
+	all = select = fragment = opt = a = input = null;
+
+	return support;
+})();
+
+var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ){
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var thisCache, ret,
+		internalKey = jQuery.expando,
+		getByName = typeof name === "string",
+
+		// We have to handle DOM nodes and JS objects differently because IE6-7
+		// can't GC object references properly across the DOM-JS boundary
+		isNode = elem.nodeType,
+
+		// Only DOM nodes need the global jQuery cache; JS object data is
+		// attached directly to the object so GC can occur automatically
+		cache = isNode ? jQuery.cache : elem,
+
+		// Only defining an ID for JS objects if its cache already exists allows
+		// the code to shortcut on the same path as a DOM node with no cache
+		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+	// Avoid doing any more work than we need to when trying to get data on an
+	// object that has no data at all
+	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
+		return;
+	}
+
+	if ( !id ) {
+		// Only DOM nodes need a new unique ID for each element since their data
+		// ends up in the global cache
+		if ( isNode ) {
+			elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
+		} else {
+			id = internalKey;
+		}
+	}
+
+	if ( !cache[ id ] ) {
+		cache[ id ] = {};
+
+		// Avoids exposing jQuery metadata on plain JS objects when the object
+		// is serialized using JSON.stringify
+		if ( !isNode ) {
+			cache[ id ].toJSON = jQuery.noop;
+		}
+	}
+
+	// An object can be passed to jQuery.data instead of a key/value pair; this gets
+	// shallow copied over onto the existing cache
+	if ( typeof name === "object" || typeof name === "function" ) {
+		if ( pvt ) {
+			cache[ id ] = jQuery.extend( cache[ id ], name );
+		} else {
+			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+		}
+	}
+
+	thisCache = cache[ id ];
+
+	// jQuery data() is stored in a separate object inside the object's internal data
+	// cache in order to avoid key collisions between internal data and user-defined
+	// data.
+	if ( !pvt ) {
+		if ( !thisCache.data ) {
+			thisCache.data = {};
+		}
+
+		thisCache = thisCache.data;
+	}
+
+	if ( data !== undefined ) {
+		thisCache[ jQuery.camelCase( name ) ] = data;
+	}
+
+	// Check for both converted-to-camel and non-converted data property names
+	// If a data property was specified
+	if ( getByName ) {
+
+		// First Try to find as-is property data
+		ret = thisCache[ name ];
+
+		// Test for null|undefined property data
+		if ( ret == null ) {
+
+			// Try to find the camelCased property
+			ret = thisCache[ jQuery.camelCase( name ) ];
+		}
+	} else {
+		ret = thisCache;
+	}
+
+	return ret;
+}
+
+function internalRemoveData( elem, name, pvt ) {
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var i, l, thisCache,
+		isNode = elem.nodeType,
+
+		// See jQuery.data for more information
+		cache = isNode ? jQuery.cache : elem,
+		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+	// If there is already no cache entry for this object, there is no
+	// purpose in continuing
+	if ( !cache[ id ] ) {
+		return;
+	}
+
+	if ( name ) {
+
+		thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+		if ( thisCache ) {
+
+			// Support array or space separated string names for data keys
+			if ( !jQuery.isArray( name ) ) {
+
+				// try the string as a key before any manipulation
+				if ( name in thisCache ) {
+					name = [ name ];
+				} else {
+
+					// split the camel cased version by spaces unless a key with the spaces exists
+					name = jQuery.camelCase( name );
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+						name = name.split(" ");
+					}
+				}
+			} else {
+				// If "name" is an array of keys...
+				// When data is initially created, via ("key", "val") signature,
+				// keys will be converted to camelCase.
+				// Since there is no way to tell _how_ a key was added, remove
+				// both plain key and camelCase key. #12786
+				// This will only penalize the array argument path.
+				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+			}
+
+			for ( i = 0, l = name.length; i < l; i++ ) {
+				delete thisCache[ name[i] ];
+			}
+
+			// If there is no data left in the cache, we want to continue
+			// and let the cache object itself get destroyed
+			if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+				return;
+			}
+		}
+	}
+
+	// See jQuery.data for more information
+	if ( !pvt ) {
+		delete cache[ id ].data;
+
+		// Don't destroy the parent cache unless the internal data object
+		// had been the only thing left in it
+		if ( !isEmptyDataObject( cache[ id ] ) ) {
+			return;
+		}
+	}
+
+	// Destroy the cache
+	if ( isNode ) {
+		jQuery.cleanData( [ elem ], true );
+
+	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+		delete cache[ id ];
+
+	// When all else fails, null
+	} else {
+		cache[ id ] = null;
+	}
+}
+
+jQuery.extend({
+	cache: {},
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data ) {
+		return internalData( elem, name, data );
+	},
+
+	removeData: function( elem, name ) {
+		return internalRemoveData( elem, name );
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return internalData( elem, name, data, true );
+	},
+
+	_removeData: function( elem, name ) {
+		return internalRemoveData( elem, name, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		// Do not set data on non-element because it will not be cleared (#8335).
+		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
+			return false;
+		}
+
+		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+		// nodes accept data unless otherwise specified; rejection can be conditional
+		return !noData || noData !== true && elem.getAttribute("classid") === noData;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var attrs, name,
+			elem = this[0],
+			i = 0,
+			data = null;
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					attrs = elem.attributes;
+					for ( ; i < attrs.length; i++ ) {
+						name = attrs[i].name;
+
+						if ( !name.indexOf( "data-" ) ) {
+							name = jQuery.camelCase( name.slice(5) );
+
+							dataAttr( elem, name, data[ name ] );
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		return jQuery.access( this, function( value ) {
+
+			if ( value === undefined ) {
+				// Try to fetch any internally stored data first
+				return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
+			}
+
+			this.each(function() {
+				jQuery.data( this, key, value );
+			});
+		}, null, value, arguments.length > 1, null, true );
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+						data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray(data) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		hooks.cur = fn;
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+			empty: jQuery.Callbacks("once memory").add(function() {
+				jQuery._removeData( elem, type + "queue" );
+				jQuery._removeData( elem, key );
+			})
+		});
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[0], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function( next, hooks ) {
+			var timeout = setTimeout( next, time );
+			hooks.stop = function() {
+				clearTimeout( timeout );
+			};
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while( i-- ) {
+			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+});
+var nodeHook, boolHook,
+	rclass = /[\t\r\n]/g,
+	rreturn = /\r/g,
+	rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i,
+	rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = jQuery.support.getSetAttribute,
+	getSetInput = jQuery.support.input;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+
+	prop: function( name, value ) {
+		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
+
+	addClass: function( value ) {
+		var classes, elem, cur, clazz, j,
+			i = 0,
+			len = this.length,
+			proceed = typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call( this, j, this.className ) );
+			});
+		}
+
+		if ( proceed ) {
+			// The disjunction here is for better compressibility (see removeClass)
+			classes = ( value || "" ).match( core_rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					" "
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+					elem.className = jQuery.trim( cur );
+
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, clazz, j,
+			i = 0,
+			len = this.length,
+			proceed = arguments.length === 0 || typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, this.className ) );
+			});
+		}
+		if ( proceed ) {
+			classes = ( value || "" ).match( core_rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					""
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+					elem.className = value ? jQuery.trim( cur ) : "";
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.match( core_rnotwhite ) || [];
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space separated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			// Toggle whole class name
+			} else if ( type === core_strundefined || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		var ret, hooks, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var val,
+				self = jQuery(this);
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
+
+				jQuery(elem).find("option").each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	},
+
+	attr: function( elem, name, value ) {
+		var hooks, notxml, ret,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === core_strundefined ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( notxml ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+
+			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
+
+		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			// In IE9+, Flash objects don't have .getAttribute (#12945)
+			// Support: IE9+
+			if ( typeof elem.getAttribute !== core_strundefined ) {
+				ret =  elem.getAttribute( name );
+			}
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret == null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( core_rnotwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( (name = attrNames[i++]) ) {
+				propName = jQuery.propFix[ name ] || name;
+
+				// Boolean attributes get special treatment (#10870)
+				if ( rboolean.test( name ) ) {
+					// Set corresponding property to false for boolean attributes
+					// Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
+					if ( !getSetAttribute && ruseDefault.test( name ) ) {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					} else {
+						elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	},
+
+	propFix: {
+		tabindex: "tabIndex",
+		readonly: "readOnly",
+		"for": "htmlFor",
+		"class": "className",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		cellpadding: "cellPadding",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		usemap: "useMap",
+		frameborder: "frameBorder",
+		contenteditable: "contentEditable"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return ( elem[ name ] = value );
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabindex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		var
+			// Use .prop to determine if this attribute is understood as boolean
+			prop = jQuery.prop( elem, name ),
+
+			// Fetch it accordingly
+			attr = typeof prop === "boolean" && elem.getAttribute( name ),
+			detail = typeof prop === "boolean" ?
+
+				getSetInput && getSetAttribute ?
+					attr != null :
+					// oldIE fabricates an empty string for missing boolean attributes
+					// and conflates checked/selected into attroperties
+					ruseDefault.test( name ) ?
+						elem[ jQuery.camelCase( "default-" + name ) ] :
+						!!attr :
+
+				// fetch an attribute node for properties not recognized as boolean
+				elem.getAttributeNode( name );
+
+		return detail && detail.value !== false ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		// Use defaultChecked and defaultSelected for oldIE
+		} else {
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+
+		return name;
+	}
+};
+
+// fix oldIE value attroperty
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			return jQuery.nodeName( elem, "input" ) ?
+
+				// Ignore the value *property* by using defaultValue
+				elem.defaultValue :
+
+				ret && ret.specified ? ret.value : undefined;
+		},
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
+				ret.value :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					(ret = elem.ownerDocument.createAttribute( name ))
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			return name === "value" || value === elem.getAttribute( name ) ?
+				value :
+				undefined;
+		}
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		get: nodeHook.get,
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
+}
+
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret == null ? undefined : ret;
+			}
+		});
+	});
+
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each([ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case senstitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	});
+}
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	});
+});
+var rformElems = /^(?:input|select|textarea)$/i,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+		var tmp, events, t, handleObjIn,
+			special, eventHandle, handleObj,
+			handlers, type, namespaces, origType,
+			elemData = jQuery._data( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
+		if ( !elemData ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !(events = elemData.events) ) {
+			events = elemData.events = {};
+		}
+		if ( !(eventHandle = elemData.handle) ) {
+			eventHandle = elemData.handle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			if ( !(handlers = events[ type ]) ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+		var j, handleObj, tmp,
+			origCount, t, events,
+			special, handlers, type,
+			namespaces, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
+
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery._removeData( elem, "events" );
+		}
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		var handle, ontype, cur,
+			bubbleType, special, tmp, i,
+			eventPath = [ elem || document ],
+			type = core_hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+
+		cur = tmp = elem = elem || document;
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf(":") < 0 && "on" + type;
+
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+
+		event.isTrigger = true;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+			null;
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === (elem.ownerDocument || document) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+
+		// Fire handlers on the event path
+		i = 0;
+		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+
+			// jQuery handler
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
+				event.preventDefault();
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					try {
+						elem[ type ]();
+					} catch ( e ) {
+						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
+						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
+					}
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
+
+		var i, ret, handleObj, matched, j,
+			handlerQueue = [],
+			args = core_slice.call( arguments ),
+			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( (event.result = ret) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var sel, handleObj, matches, i,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		// Black-hole SVG <use> instance trees (#13180)
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+			for ( ; cur != this; cur = cur.parentNode || this ) {
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matches[ sel ] === undefined ) {
+							matches[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matches[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, handlers: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+		}
+
+		return handlerQueue;
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
+
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = new jQuery.Event( originalEvent );
+
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Support: IE<9
+		// Fix target property (#1925)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Support: Chrome 23+, Safari?
+		// Target should not be a text node (#504, #13143)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Support: IE<9
+		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+		event.metaKey = !!event.metaKey;
+
+		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var body, eventDoc, doc,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	special: {
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		click: {
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+					this.click();
+					return false;
+				}
+			}
+		},
+		focus: {
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== document.activeElement && this.focus ) {
+					try {
+						this.focus();
+						return false;
+					} catch ( e ) {
+						// Support: IE<9
+						// If we error on focus to hidden element (#1486, #12518),
+						// let .trigger() run the handlers
+					}
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === document.activeElement && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Even when returnValue equals to undefined Firefox will still show alert
+				if ( event.result !== undefined ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{ type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		var name = "on" + type;
+
+		if ( elem.detachEvent ) {
+
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
+			// detachEvent needed property on element, by name of that event, to properly expose it to GC
+			if ( typeof elem[ name ] === core_strundefined ) {
+				elem[ name ] = null;
+			}
+
+			elem.detachEvent( name, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+		if ( !e ) {
+			return;
+		}
+
+		// If preventDefault exists, run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// Support: IE
+		// Otherwise set the returnValue property of the original event to false
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+		if ( !e ) {
+			return;
+		}
+		// If stopPropagation exists, run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+
+		// Support: IE
+		// Set the cancelBubble property of the original event to true
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	}
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// IE submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submit_bubble = true;
+					});
+					jQuery._data( form, "submitBubbles", true );
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+
+		postDispatch: function( event ) {
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submit_bubble ) {
+				delete event._submit_bubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event, true );
+				}
+			}
+		},
+
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !jQuery.support.changeBubbles ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+						}
+						// Allow triggered, simulated change events (#11500)
+						jQuery.event.simulate( "change", this, event, true );
+					});
+				}
+				return false;
+			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					jQuery._data( elem, "changeBubbles", true );
+				}
+			});
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return !rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0,
+			handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var type, origFn;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[0];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
+		}
+	}
+});
+/*!
+ * Sizzle CSS Selector Engine
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://sizzlejs.com/
+ */
+(function( window, undefined ) {
+
+var i,
+	cachedruns,
+	Expr,
+	getText,
+	isXML,
+	compile,
+	hasDuplicate,
+	outermostContext,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsXML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+	sortOrder,
+
+	// Instance-specific data
+	expando = "sizzle" + -(new Date()),
+	preferredDoc = window.document,
+	support = {},
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+
+	// General-purpose constants
+	strundefined = typeof undefined,
+	MAX_NEGATIVE = 1 << 31,
+
+	// Array methods
+	arr = [],
+	pop = arr.pop,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf if we can't use a native one
+	indexOf = arr.indexOf || function( elem ) {
+		var i = 0,
+			len = this.length;
+		for ( ; i < len; i++ ) {
+			if ( this[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+
+	// Regular expressions
+
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
+
+	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
+	operators = "([*^$|!~]?=)",
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
+		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+
+	// Prefer arguments quoted,
+	//   then not containing pseudos/brackets,
+	//   then attribute selectors/non-parenthetical expressions,
+	//   then anything else
+	// These preferences are here to reduce the number of selectors
+	//   needing tokenize in the PSEUDO preFilter
+	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rsibling = /[\x20\t\r\n\f]*[+~]/,
+
+	rnative = /^[^{]+\{\s*\[native code/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rescape = /'|\\/g,
+	rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
+
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
+	funescape = function( _, escaped ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		return high !== high ?
+			escaped :
+			// BMP codepoint
+			high < 0 ?
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	};
+
+// Use a stripped-down slice if we can't use a native one
+try {
+	slice.call( preferredDoc.documentElement.childNodes, 0 )[0].nodeType;
+} catch ( e ) {
+	slice = function( i ) {
+		var elem,
+			results = [];
+		while ( (elem = this[i++]) ) {
+			results.push( elem );
+		}
+		return results;
+	};
+}
+
+/**
+ * For feature detection
+ * @param {Function} fn The function to test for native support
+ */
+function isNative( fn ) {
+	return rnative.test( fn + "" );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var cache,
+		keys = [];
+
+	return (cache = function( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key += " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key ] = value);
+	});
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
+
+	try {
+		return fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// release memory in IE
+		div = null;
+	}
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var match, elem, m, nodeType,
+		// QSA vars
+		i, groups, old, nid, newContext, newSelector;
+
+	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+		setDocument( context );
+	}
+
+	context = context || document;
+	results = results || [];
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( !documentIsXML && !seed ) {
+
+		// Shortcuts
+		if ( (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
+				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
+				return results;
+			}
+		}
+
+		// QSA path
+		if ( support.qsa && !rbuggyQSA.test(selector) ) {
+			old = true;
+			nid = expando;
+			newContext = context;
+			newSelector = nodeType === 9 && selector;
+
+			// qSA works strangely on Element-rooted queries
+			// We can work around this by specifying an extra ID on the root
+			// and working up from there (Thanks to Andrew Dupont for the technique)
+			// IE 8 doesn't work on object elements
+			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+				groups = tokenize( selector );
+
+				if ( (old = context.getAttribute("id")) ) {
+					nid = old.replace( rescape, "\\$&" );
+				} else {
+					context.setAttribute( "id", nid );
+				}
+				nid = "[id='" + nid + "'] ";
+
+				i = groups.length;
+				while ( i-- ) {
+					groups[i] = nid + toSelector( groups[i] );
+				}
+				newContext = rsibling.test( selector ) && context.parentNode || context;
+				newSelector = groups.join(",");
+			}
+
+			if ( newSelector ) {
+				try {
+					push.apply( results, slice.call( newContext.querySelectorAll(
+						newSelector
+					), 0 ) );
+					return results;
+				} catch(qsaError) {
+				} finally {
+					if ( !old ) {
+						context.removeAttribute("id");
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Detect xml
+ * @param {Element|Object} elem An element or a document
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// If no document and documentElement is available, return
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Set our document
+	document = doc;
+	docElem = doc.documentElement;
+
+	// Support tests
+	documentIsXML = isXML( doc );
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.tagNameNoComments = assert(function( div ) {
+		div.appendChild( doc.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Check if attributes should be retrieved by attribute nodes
+	support.attributes = assert(function( div ) {
+		div.innerHTML = "<select></select>";
+		var type = typeof div.lastChild.getAttribute("multiple");
+		// IE8 returns a string for some attributes even when not present
+		return type !== "boolean" && type !== "string";
+	});
+
+	// Check if getElementsByClassName can be trusted
+	support.getByClassName = assert(function( div ) {
+		// Opera can't find a second classname (in 9.6)
+		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
+		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
+			return false;
+		}
+
+		// Safari 3.2 caches class attributes and doesn't catch changes
+		div.lastChild.className = "e";
+		return div.getElementsByClassName("e").length === 2;
+	});
+
+	// Check if getElementById returns elements by name
+	// Check if getElementsByName privileges form controls or returns elements by ID
+	support.getByName = assert(function( div ) {
+		// Inject content
+		div.id = expando + 0;
+		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
+		docElem.insertBefore( div, docElem.firstChild );
+
+		// Test
+		var pass = doc.getElementsByName &&
+			// buggy browsers will return fewer than the correct 2
+			doc.getElementsByName( expando ).length === 2 +
+			// buggy browsers will return more than the correct 0
+			doc.getElementsByName( expando + 0 ).length;
+		support.getIdNotName = !doc.getElementById( expando );
+
+		// Cleanup
+		docElem.removeChild( div );
+
+		return pass;
+	});
+
+	// IE6/7 return modified attributes
+	Expr.attrHandle = assert(function( div ) {
+		div.innerHTML = "<a href='#'></a>";
+		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
+			div.firstChild.getAttribute("href") === "#";
+	}) ?
+		{} :
+		{
+			"href": function( elem ) {
+				return elem.getAttribute( "href", 2 );
+			},
+			"type": function( elem ) {
+				return elem.getAttribute("type");
+			}
+		};
+
+	// ID find and filter
+	if ( support.getIdNotName ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
+				var m = context.getElementById( id );
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
+				var m = context.getElementById( id );
+
+				return m ?
+					m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.tagNameNoComments ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== strundefined ) {
+				return context.getElementsByTagName( tag );
+			}
+		} :
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Name
+	Expr.find["NAME"] = support.getByName && function( tag, context ) {
+		if ( typeof context.getElementsByName !== strundefined ) {
+			return context.getElementsByName( name );
+		}
+	};
+
+	// Class
+	Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
+		if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21),
+	// no need to also add to buggyMatches since matches checks buggyQSA
+	// A support test would require too much code (would include document ready)
+	rbuggyQSA = [ ":focus" ];
+
+	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explictly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			div.innerHTML = "<select><option selected=''></option></select>";
+
+			// IE8 - Some boolean attributes are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+		});
+
+		assert(function( div ) {
+
+			// Opera 10-12/IE8 - ^= $= *= and empty values
+			// Should not select anything
+			div.innerHTML = "<input type='hidden' i=''/>";
+			if ( div.querySelectorAll("[i^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.webkitMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
+
+	// Element contains another
+	// Purposefully does not implement inclusive descendent
+	// As in, an element does not contain itself
+	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	// Document order sorting
+	sortOrder = docElem.compareDocumentPosition ?
+	function( a, b ) {
+		var compare;
+
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
+			if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
+				if ( a === doc || contains( preferredDoc, a ) ) {
+					return -1;
+				}
+				if ( b === doc || contains( preferredDoc, b ) ) {
+					return 1;
+				}
+				return 0;
+			}
+			return compare & 4 ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition ? -1 : 1;
+	} :
+	function( a, b ) {
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Parentless nodes are either documents or disconnected
+		} else if ( !aup || !bup ) {
+			return a === doc ? -1 :
+				b === doc ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	// Always assume the presence of duplicates if sort doesn't
+	// pass them to our comparison function (as in Google Chrome).
+	hasDuplicate = false;
+	[0, 0].sort( sortOrder );
+	support.detectDuplicates = hasDuplicate;
+
+	return document;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	// rbuggyQSA always contains :focus, so no need for an existence check
+	if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch(e) {}
+	}
+
+	return Sizzle( expr, document, null, [elem] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	var val;
+
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	if ( !documentIsXML ) {
+		name = name.toLowerCase();
+	}
+	if ( (val = Expr.attrHandle[ name ]) ) {
+		return val( elem );
+	}
+	if ( documentIsXML || support.attributes ) {
+		return elem.getAttribute( name );
+	}
+	return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
+		name :
+		val && val.specified ? val.value : null;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+// Document sorting and removing duplicates
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		i = 1,
+		j = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		for ( ; (elem = results[i]); i++ ) {
+			if ( elem === results[ i - 1 ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	return results;
+};
+
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && ( ~b.sourceIndex || MAX_NEGATIVE ) - ( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+// Returns a function to use in pseudos for input types
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+// Returns a function to use in pseudos for buttons
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+// Returns a function to use in pseudos for positionals
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		for ( ; (node = elem[i]); i++ ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (see #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[5] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[4] ) {
+				match[2] = match[4];
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeName ) {
+			if ( nodeName === "*" ) {
+				return function() { return true; };
+			}
+
+			nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+			};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, outerCache, node, diff, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+							// Seek `elem` from a previously-cached index
+							outerCache = parent[ expando ] || (parent[ expando ] = {});
+							cache = outerCache[ type ] || [];
+							nodeIndex = cache[0] === dirruns && cache[1];
+							diff = cache[0] === dirruns && cache[2];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						// Use previously-cached element index if available
+						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+							diff = cache[1];
+
+						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+						} else {
+							// Use the same loop as above to seek `elem` from the start
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+									// Cache the index of each encountered element
+									if ( useCache ) {
+										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+									}
+
+									if ( node === elem ) {
+										break;
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf.call( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifider
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsXML ?
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
+						elem.lang) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
+			//   not comment, processing instructions, or others
+			// Thanks to Diego Perini for the nodeName shortcut
+			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+function tokenize( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( tokens = [] );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push( {
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			} );
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push( {
+					value: matched,
+					type: type,
+					matches: match
+				} );
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+}
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var data, cache, outerCache,
+				dirkey = dirruns + " " + doneName;
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
+							if ( (data = cache[1]) === true || data === cachedruns ) {
+								return data === true;
+							}
+						} else {
+							cache = outerCache[ dir ] = [ dirkey ];
+							cache[1] = matcher( elem, context, xml ) || cachedruns;
+							if ( cache[1] === true ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf.call( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	// A counter to specify which element is currently being matched
+	var matcherCachedRuns = 0,
+		bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, expandContext ) {
+			var elem, j, matcher,
+				setMatched = [],
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				outermost = expandContext != null,
+				contextBackup = outermostContext,
+				// We must always have either seed elements or context
+				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
+
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+				cachedruns = matcherCachedRuns;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+			for ( ; (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+						cachedruns = ++matcherCachedRuns;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !group ) {
+			group = tokenize( selector );
+		}
+		i = group.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( group[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+	}
+	return cached;
+};
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function select( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		match = tokenize( selector );
+
+	if ( !seed ) {
+		// Try to minimize operations if there is only one group
+		if ( match.length === 1 ) {
+
+			// Take a shortcut and set the context if the root selector is an ID
+			tokens = match[0] = match[0].slice( 0 );
+			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+					context.nodeType === 9 && !documentIsXML &&
+					Expr.relative[ tokens[1].type ] ) {
+
+				context = Expr.find["ID"]( token.matches[0].replace( runescape, funescape ), context )[0];
+				if ( !context ) {
+					return results;
+				}
+
+				selector = selector.slice( tokens.shift().value.length );
+			}
+
+			// Fetch a seed set for right-to-left matching
+			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+			while ( i-- ) {
+				token = tokens[i];
+
+				// Abort if we hit a combinator
+				if ( Expr.relative[ (type = token.type) ] ) {
+					break;
+				}
+				if ( (find = Expr.find[ type ]) ) {
+					// Search, expanding context for leading sibling combinators
+					if ( (seed = find(
+						token.matches[0].replace( runescape, funescape ),
+						rsibling.test( tokens[0].type ) && context.parentNode || context
+					)) ) {
+
+						// If seed is empty or no tokens remain, we can return early
+						tokens.splice( i, 1 );
+						selector = seed.length && toSelector( tokens );
+						if ( !selector ) {
+							push.apply( results, slice.call( seed, 0 ) );
+							return results;
+						}
+
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function
+	// Provide `match` to avoid retokenization if we modified the selector above
+	compile( selector, match )(
+		seed,
+		context,
+		documentIsXML,
+		results,
+		rsibling.test( selector )
+	);
+	return results;
+}
+
+// Deprecated
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Easy API for creating new setFilters
+function setFilters() {}
+Expr.filters = setFilters.prototype = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+// Initialize with the default document
+setDocument();
+
+// Override sizzle attribute retrieval
+Sizzle.attr = jQuery.attr;
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})( window );
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	rneedsContext = jQuery.expr.match.needsContext,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i, ret, self,
+			len = this.length;
+
+		if ( typeof selector !== "string" ) {
+			self = this;
+			return this.pushStack( jQuery( selector ).filter(function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			}) );
+		}
+
+		ret = [];
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, this[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
+		return ret;
+	},
+
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter(function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false) );
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true) );
+	},
+
+	is: function( selector ) {
+		return !!selector && (
+			typeof selector === "string" ?
+				// If this is a positional/relative selector, check membership in the returned set
+				// so $("p:first").is("p:last") won't return true for a doc with two "p".
+				rneedsContext.test( selector ) ?
+					jQuery( selector, this.context ).index( this[0] ) >= 0 :
+					jQuery.filter( selector, this ).length > 0 :
+				this.filter( selector ).length > 0 );
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			ret = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+				}
+				cur = cur.parentNode;
+			}
+		}
+
+		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( jQuery.unique(all) );
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
+	}
+});
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( this.length > 1 && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem ) {
+			return ( elem === qualifier ) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
+	});
+}
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style|link)/i,
+	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /^$|\/(?:java|ecma)script/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+	// We have to close these tags to support XHTML (#13200)
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		area: [ 1, "<map>", "</map>" ],
+		param: [ 1, "<object>", "</object>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+		// unless wrapped in a div with non-breaking characters in front of it.
+		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
+	},
+	safeFragment = createSafeFragment( document ),
+	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+jQuery.fn.extend({
+	text: function( value ) {
+		return jQuery.access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+		}, null, value, arguments.length );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		return this.domManip( arguments, false, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		});
+	},
+
+	after: function() {
+		return this.domManip( arguments, false, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		});
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( getAll( elem ) );
+				}
+
+				if ( elem.parentNode ) {
+					if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+						setGlobalEval( getAll( elem, "script" ) );
+					}
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem, false ) );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		return jQuery.access( this, function( value ) {
+			var elem = this[0] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
+
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+				try {
+					for (; i < l; i++ ) {
+						// Remove element nodes and prevent memory leaks
+						elem = this[i] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch(e) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function( value ) {
+		var isFunc = jQuery.isFunction( value );
+
+		// Make sure that the elements are removed from the DOM before they are inserted
+		// this can help fix replacing a parent with child elements
+		if ( !isFunc && typeof value !== "string" ) {
+			value = jQuery( value ).not( this ).detach();
+		}
+
+		return this.domManip( [ value ], true, function( elem ) {
+			var next = this.nextSibling,
+				parent = this.parentNode;
+
+			if ( parent ) {
+				jQuery( this ).remove();
+				parent.insertBefore( elem, next );
+			}
+		});
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+
+		// Flatten any nested arrays
+		args = core_concat.apply( [], args );
+
+		var first, node, hasScripts,
+			scripts, doc, fragment,
+			i = 0,
+			l = this.length,
+			set = this,
+			iNoClone = l - 1,
+			value = args[0],
+			isFunction = jQuery.isFunction( value );
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
+			return this.each(function( index ) {
+				var self = set.eq( index );
+				if ( isFunction ) {
+					args[0] = value.call( this, index, table ? self.html() : undefined );
+				}
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( l ) {
+			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
+			first = fragment.firstChild;
+
+			if ( fragment.childNodes.length === 1 ) {
+				fragment = first;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+				hasScripts = scripts.length;
+
+				// Use the original fragment for the last item instead of the first because it can end up
+				// being emptied incorrectly in certain situations (#8070).
+				for ( ; i < l; i++ ) {
+					node = fragment;
+
+					if ( i !== iNoClone ) {
+						node = jQuery.clone( node, true, true );
+
+						// Keep references to cloned scripts for later restoration
+						if ( hasScripts ) {
+							jQuery.merge( scripts, getAll( node, "script" ) );
+						}
+					}
+
+					callback.call(
+						table && jQuery.nodeName( this[i], "table" ) ?
+							findOrAppend( this[i], "tbody" ) :
+							this[i],
+						node,
+						i
+					);
+				}
+
+				if ( hasScripts ) {
+					doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+					// Reenable scripts
+					jQuery.map( scripts, restoreScript );
+
+					// Evaluate executable scripts on first document insertion
+					for ( i = 0; i < hasScripts; i++ ) {
+						node = scripts[ i ];
+						if ( rscriptType.test( node.type || "" ) &&
+							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+							if ( node.src ) {
+								// Hope ajax is available...
+								jQuery.ajax({
+									url: node.src,
+									type: "GET",
+									dataType: "script",
+									async: false,
+									global: false,
+									"throws": true
+								});
+							} else {
+								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+							}
+						}
+					}
+				}
+
+				// Fix #11809: Avoid leaking memory
+				fragment = first = null;
+			}
+		}
+
+		return this;
+	}
+});
+
+function findOrAppend( elem, tag ) {
+	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	var attr = elem.getAttributeNode("type");
+	elem.type = ( attr && attr.specified ) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+	if ( match ) {
+		elem.type = match[1];
+	} else {
+		elem.removeAttribute("type");
+	}
+	return elem;
+}
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; (elem = elems[i]) != null; i++ ) {
+		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+	}
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function fixCloneNodeIssues( src, dest ) {
+	var nodeName, e, data;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 copies events bound via attachEvent when using cloneNode.
+	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
+		data = jQuery._data( dest );
+
+		for ( e in data.events ) {
+			jQuery.removeEvent( dest, e, data.handle );
+		}
+
+		// Event data gets referenced instead of copied if the expando gets copied too
+		dest.removeAttribute( jQuery.expando );
+	}
+
+	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+	if ( nodeName === "script" && dest.text !== src.text ) {
+		disableScript( dest ).text = src.text;
+		restoreScript( dest );
+
+	// IE6-10 improperly clones children of object elements using classid.
+	// IE10 throws NoModificationAllowedError if parent is null, #12132.
+	} else if ( nodeName === "object" ) {
+		if ( dest.parentNode ) {
+			dest.outerHTML = src.outerHTML;
+		}
+
+		// This path appears unavoidable for IE9. When cloning an object
+		// element in IE9, the outerHTML strategy above is not sufficient.
+		// If the src has innerHTML and the destination does not,
+		// copy the src.innerHTML into the dest.innerHTML. #10324
+		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+			dest.innerHTML = src.innerHTML;
+		}
+
+	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+
+		dest.defaultChecked = dest.checked = src.checked;
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.defaultSelected = dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone(true);
+			jQuery( insert[i] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			core_push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+});
+
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
+			undefined;
+
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+// Used in buildFragment, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( manipulation_rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var destElements, node, clone, i, srcElements,
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+			clone = elem.cloneNode( true );
+
+		// IE<=8 does not properly clone detached, unknown element nodes
+		} else {
+			fragmentDiv.innerHTML = elem.outerHTML;
+			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+		}
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+
+			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			// Fix all IE cloning issues
+			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					fixCloneNodeIssues( node, destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
+					cloneCopyEvent( node, destElements[i] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		destElements = srcElements = node = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	buildFragment: function( elems, context, scripts, selection ) {
+		var j, elem, contains,
+			tmp, tag, tbody, wrap,
+			l = elems.length,
+
+			// Ensure a safe fragment
+			safe = createSafeFragment( context ),
+
+			nodes = [],
+			i = 0;
+
+		for ( ; i < l; i++ ) {
+			elem = elems[ i ];
+
+			if ( elem || elem === 0 ) {
+
+				// Add nodes directly
+				if ( jQuery.type( elem ) === "object" ) {
+					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+				// Convert non-html into a text node
+				} else if ( !rhtml.test( elem ) ) {
+					nodes.push( context.createTextNode( elem ) );
+
+				// Convert html into DOM nodes
+				} else {
+					tmp = tmp || safe.appendChild( context.createElement("div") );
+
+					// Deserialize a standard representation
+					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
+					wrap = wrapMap[ tag ] || wrapMap._default;
+
+					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+
+					// Descend through wrappers to the right content
+					j = wrap[0];
+					while ( j-- ) {
+						tmp = tmp.lastChild;
+					}
+
+					// Manually add leading whitespace removed by IE
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						elem = tag === "table" && !rtbody.test( elem ) ?
+							tmp.firstChild :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !rtbody.test( elem ) ?
+								tmp :
+								0;
+
+						j = elem && elem.childNodes.length;
+						while ( j-- ) {
+							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
+								elem.removeChild( tbody );
+							}
+						}
+					}
+
+					jQuery.merge( nodes, tmp.childNodes );
+
+					// Fix #12392 for WebKit and IE > 9
+					tmp.textContent = "";
+
+					// Fix #12392 for oldIE
+					while ( tmp.firstChild ) {
+						tmp.removeChild( tmp.firstChild );
+					}
+
+					// Remember the top-level container for proper cleanup
+					tmp = safe.lastChild;
+				}
+			}
+		}
+
+		// Fix #11356: Clear elements from fragment
+		if ( tmp ) {
+			safe.removeChild( tmp );
+		}
+
+		// Reset defaultChecked for any radios and checkboxes
+		// about to be appended to the DOM in IE 6/7 (#8060)
+		if ( !jQuery.support.appendChecked ) {
+			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+		}
+
+		i = 0;
+		while ( (elem = nodes[ i++ ]) ) {
+
+			// #4087 - If origin and destination elements are the same, and this is
+			// that element, do not do anything
+			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+				continue;
+			}
+
+			contains = jQuery.contains( elem.ownerDocument, elem );
+
+			// Append to fragment
+			tmp = getAll( safe.appendChild( elem ), "script" );
+
+			// Preserve script evaluation history
+			if ( contains ) {
+				setGlobalEval( tmp );
+			}
+
+			// Capture executables
+			if ( scripts ) {
+				j = 0;
+				while ( (elem = tmp[ j++ ]) ) {
+					if ( rscriptType.test( elem.type || "" ) ) {
+						scripts.push( elem );
+					}
+				}
+			}
+		}
+
+		tmp = null;
+
+		return safe;
+	},
+
+	cleanData: function( elems, /* internal */ acceptData ) {
+		var elem, type, id, data,
+			i = 0,
+			internalKey = jQuery.expando,
+			cache = jQuery.cache,
+			deleteExpando = jQuery.support.deleteExpando,
+			special = jQuery.event.special;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+
+			if ( acceptData || jQuery.acceptData( elem ) ) {
+
+				id = elem[ internalKey ];
+				data = id && cache[ id ];
+
+				if ( data ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Remove cache only if it was not already removed by jQuery.event.remove
+					if ( cache[ id ] ) {
+
+						delete cache[ id ];
+
+						// IE does not allow us to delete expando properties from nodes,
+						// nor does it have a removeAttribute function on Document nodes;
+						// we must handle all of these cases
+						if ( deleteExpando ) {
+							delete elem[ internalKey ];
+
+						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
+							elem.removeAttribute( internalKey );
+
+						} else {
+							elem[ internalKey ] = null;
+						}
+
+						core_deletedIds.push( id );
+					}
+				}
+			}
+		}
+	}
+});
+var iframe, getStyles, curCSS,
+	ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/,
+	rposition = /^(top|right|bottom|left)$/,
+	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rmargin = /^margin/,
+	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
+	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
+	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
+	elemdisplay = { BODY: "block" },
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: 0,
+		fontWeight: 400
+	},
+
+	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+	// shortcut for names that are not vendor prefixed
+	if ( name in style ) {
+		return name;
+	}
+
+	// check for vendor prefixed names
+	var capName = name.charAt(0).toUpperCase() + name.slice(1),
+		origName = name,
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in style ) {
+			return name;
+		}
+	}
+
+	return origName;
+}
+
+function isHidden( elem, el ) {
+	// isHidden might be called from jQuery#filter function;
+	// in that case, element will be second argument
+	elem = el || elem;
+	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+}
+
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+			}
+		} else {
+
+			if ( !values[ index ] ) {
+				hidden = isHidden( elem );
+
+				if ( display && display !== "none" || !hidden ) {
+					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+				}
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+jQuery.fn.extend({
+	css: function( name, value ) {
+		return jQuery.access( this, function( elem, name, value ) {
+			var len, styles,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		var bool = typeof state === "boolean";
+
+		return this.each(function() {
+			if ( bool ? state : isHidden( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"columnCount": true,
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight (for every problematic property) identical functions
+			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+		}
+		return val;
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback, args ) {
+		var ret, name,
+			old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		ret = callback.apply( elem, args || [] );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+
+		return ret;
+	}
+});
+
+// NOTE: we've included the "window" in window.getComputedStyle
+// because jsdom on node.js will break without it.
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+		return window.getComputedStyle( elem, null );
+	};
+
+	curCSS = function( elem, name, _computed ) {
+		var width, minWidth, maxWidth,
+			computed = _computed || getStyles( elem ),
+
+			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
+			style = elem.style;
+
+		if ( computed ) {
+
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		return ret;
+	};
+} else if ( document.documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, _computed ) {
+		var left, rs, rsLeft,
+			computed = _computed || getStyles( elem ),
+			ret = computed ? computed[ name ] : undefined,
+			style = elem.style;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are proportional to the parent element instead
+		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+		// If we already have the right measurement, avoid augmentation
+		4 :
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test(val) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+// Try to determine the default display value of an element
+function css_defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+			// Use the already-created iframe if possible
+			iframe = ( iframe ||
+				jQuery("<iframe frameborder='0' width='0' height='0'/>")
+				.css( "cssText", "display:block !important" )
+			).appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
+			doc.write("<!doctype html><html><body>");
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+
+// Called ONLY from within css_defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+		display = jQuery.css( elem[0], "display" );
+	elem.remove();
+	return display;
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
+					jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					}) :
+					getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+// These hooks cannot be added until DOM ready because the support test
+// for it is not run until after DOM ready
+jQuery(function() {
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+					// Work around by temporarily setting element display to inline-block
+					return jQuery.swap( elem, { "display": "inline-block" },
+						curCSS, [ elem, "marginRight" ] );
+				}
+			}
+		};
+	}
+
+	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+	// getComputedStyle returns percent when specified for top/left/bottom/right
+	// rather than make the css module depend on the offset module, we just check for it here
+	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
+		jQuery.each( [ "top", "left" ], function( i, prop ) {
+			jQuery.cssHooks[ prop ] = {
+				get: function( elem, computed ) {
+					if ( computed ) {
+						computed = curCSS( elem, prop );
+						// if curCSS returns percentage, fallback to offset
+						return rnumnonpx.test( computed ) ?
+							jQuery( elem ).position()[ prop ] + "px" :
+							computed;
+					}
+				}
+			};
+		});
+	}
+
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		// Support: Opera <= 12.12
+		// Opera reports offsetWidths and offsetHeights less than zero on some elements
+		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
+			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+});
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+jQuery.fn.extend({
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map(function(){
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		})
+		.filter(function(){
+			var type = this.type;
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !manipulation_rcheckableType.test( type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+//Serialize an array of form elements or a set of
+//key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		});
+
+	} else {
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+});
+
+jQuery.fn.hover = function( fnOver, fnOut ) {
+	return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+};
+var
+	// Document location
+	ajaxLocParts,
+	ajaxLocation,
+	ajax_nonce = jQuery.now(),
+
+	ajax_rquery = /\?/,
+	rhash = /#.*$/,
+	rts = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat("*");
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+
+		if ( jQuery.isFunction( func ) ) {
+			// For each dataType in the dataTypeExpression
+			while ( (dataType = dataTypes[i++]) ) {
+				// Prepend if requested
+				if ( dataType[0] === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+				// Otherwise append
+				} else {
+					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		});
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var deep, key,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, response, type,
+		self = this,
+		off = url.indexOf(" ");
+
+	if ( off >= 0 ) {
+		selector = url.slice( off, url.length );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax({
+			url: url,
+
+			// if "type" variable is undefined, then "GET" method will be used
+			type: type,
+			dataType: "html",
+			data: params
+		}).done(function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		}).complete( callback && function( jqXHR, status ) {
+			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+		});
+	}
+
+	return this;
+};
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
+	jQuery.fn[ type ] = function( fn ){
+		return this.on( type, fn );
+	};
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		});
+	};
+});
+
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		type: "GET",
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Cross-domain detection vars
+			parts,
+			// Loop variable
+			i,
+			// URL without anti-cache param
+			cacheURL,
+			// Response headers as string
+			responseHeadersString,
+			// timeout handle
+			timeoutTimer,
+
+			// To know if global events are to be dispatched
+			fireGlobals,
+
+			transport,
+			// Response headers
+			responseHeaders,
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+				jQuery( callbackContext ) :
+				jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks("once memory"),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// The jqXHR state
+			state = 0,
+			// Default abort message
+			strAbort = "canceled",
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( (match = rheaders.exec( responseHeadersString )) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					var lname = name.toLowerCase();
+					if ( !state ) {
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( state < 2 ) {
+							for ( code in map ) {
+								// Lazy-add the new callback in a way that preserves old ones
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						} else {
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR ).complete = completeDeferred.add;
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger("ajaxStart");
+		}
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		cacheURL = s.url;
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+				s.url = rts.test( cacheURL ) ?
+
+					// If there is already a '_' parameter, set its value
+					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+
+					// Otherwise add one to the end
+					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+			}
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout(function() {
+					jqXHR.abort("timeout");
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader("Last-Modified");
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader("etag");
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 ) {
+					isSuccess = true;
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					isSuccess = true;
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					isSuccess = ajaxConvert( s, response );
+					statusText = isSuccess.state;
+					success = isSuccess.data;
+					error = isSuccess.error;
+					isSuccess = !error;
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger("ajaxStop");
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	}
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields;
+
+	// Fill responseXXX fields
+	for ( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+	var conv2, current, conv, tmp,
+		converters = {},
+		i = 0,
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice(),
+		prev = dataTypes[ 0 ];
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	// Convert to each sequential dataType, tolerating list modification
+	for ( ; (current = dataTypes[++i]); ) {
+
+		// There's only work to do if current dataType is non-auto
+		if ( current !== "*" ) {
+
+			// Convert response if prev dataType is non-auto and differs from current
+			if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split(" ");
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.splice( i--, 0, current );
+								}
+
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s["throws"] ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						}
+					}
+				}
+			}
+
+			// Update prev for next iteration
+			prev = current;
+		}
+	}
+
+	return { state: "success", data: response };
+}
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /(?:java|ecma)script/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || jQuery("head")[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement("script");
+
+				script.async = true;
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( script.parentNode ) {
+							script.parentNode.removeChild( script );
+						}
+
+						// Dereference the script
+						script = null;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+
+				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+				// Use native DOM manipulation to avoid our domManip AJAX trickery
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( undefined, true );
+				}
+			}
+		};
+	}
+});
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always(function() {
+			// Restore preexisting value
+			window[ callbackName ] = overwritten;
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		});
+
+		// Delegate to script
+		return "script";
+	}
+});
+var xhrCallbacks, xhrSupported,
+	xhrId = 0,
+	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject && function() {
+		// Abort all pending requests
+		var key;
+		for ( key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
+	};
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject("Microsoft.XMLHTTP");
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+xhrSupported = jQuery.ajaxSettings.xhr();
+jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = jQuery.support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var handle, i,
+						xhr = s.xhr();
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers["X-Requested-With"] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( err ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, responseHeaders, statusText, responses;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occurred
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									responses = {};
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+
+									// When requesting binary data, IE6-9 will throw an exception
+									// on any attempt to access responseText (#11426)
+									if ( typeof xhr.responseText === "string" ) {
+										responses.text = xhr.responseText;
+									}
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					if ( !s.async ) {
+						// if we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						setTimeout( callback );
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
+					}
+				}
+			};
+		}
+	});
+}
+var fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
+	rrun = /queueHooks$/,
+	animationPrefilters = [ defaultPrefilter ],
+	tweeners = {
+		"*": [function( prop, value ) {
+			var end, unit,
+				tween = this.createTween( prop, value ),
+				parts = rfxnum.exec( value ),
+				target = tween.cur(),
+				start = +target || 0,
+				scale = 1,
+				maxIterations = 20;
+
+			if ( parts ) {
+				end = +parts[2];
+				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+
+				// We need to compute starting value
+				if ( unit !== "px" && start ) {
+					// Iteratively approximate from a nonzero starting point
+					// Prefer the current property, because this process will be trivial if it uses the same units
+					// Fallback to end or a simple constant
+					start = jQuery.css( tween.elem, prop, true ) || end || 1;
+
+					do {
+						// If previous iteration zeroed out, double until we get *something*
+						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
+						scale = scale || ".5";
+
+						// Adjust and apply
+						start = start / scale;
+						jQuery.style( tween.elem, prop, start + unit );
+
+					// Update scale, tolerating zero or NaN from tween.cur()
+					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+				}
+
+				tween.unit = unit;
+				tween.start = start;
+				// If a +=/-= token was provided, we're doing a relative animation
+				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
+			}
+			return tween;
+		}]
+	};
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout(function() {
+		fxNow = undefined;
+	});
+	return ( fxNow = jQuery.now() );
+}
+
+function createTweens( animation, props ) {
+	jQuery.each( props, function( prop, value ) {
+		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+			index = 0,
+			length = collection.length;
+		for ( ; index < length; index++ ) {
+			if ( collection[ index ].call( animation, prop, value ) ) {
+
+				// we're done with this property
+				return;
+			}
+		}
+	});
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = animationPrefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		}),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise({
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, { specialEasing: {} }, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		}),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			return result;
+		}
+	}
+
+	createTweens( animation, props );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		})
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+function propFilter( props, specialEasing ) {
+	var value, name, index, easing, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.split(" ");
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			tweeners[ prop ] = tweeners[ prop ] || [];
+			tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			animationPrefilters.unshift( callback );
+		} else {
+			animationPrefilters.push( callback );
+		}
+	}
+});
+
+function defaultPrefilter( elem, props, opts ) {
+	/*jshint validthis:true */
+	var prop, index, length,
+		value, dataShow, toggle,
+		tween, hooks, oldfire,
+		anim = this,
+		style = elem.style,
+		orig = {},
+		handled = [],
+		hidden = elem.nodeType && isHidden( elem );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always(function() {
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always(function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			});
+		});
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		if ( jQuery.css( elem, "display" ) === "inline" &&
+				jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !jQuery.support.shrinkWrapBlocks ) {
+			anim.always(function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			});
+		}
+	}
+
+
+	// show/hide pass
+	for ( index in props ) {
+		value = props[ index ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ index ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+				continue;
+			}
+			handled.push( index );
+		}
+	}
+
+	length = handled.length;
+	if ( length ) {
+		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
+		if ( "hidden" in dataShow ) {
+			hidden = dataShow.hidden;
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( index = 0 ; index < length ; index++ ) {
+			prop = handled[ index ];
+			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
+			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+	}
+}
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || "swing";
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			if ( tween.elem[ tween.prop ] != null &&
+				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Remove in 2.0 - this supports IE8's panic based approach
+// to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+});
+
+jQuery.fn.extend({
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate({ opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+				doAnimation.finish = function() {
+					anim.stop( true );
+				};
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each(function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.cur && hooks.cur.finish ) {
+				hooks.cur.finish.call( this );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		});
+	}
+});
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth? 1 : 0;
+	for( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show"),
+	slideUp: genFx("hide"),
+	slideToggle: genFx("toggle"),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p*Math.PI ) / 2;
+	}
+};
+
+jQuery.timers = [];
+jQuery.fx = Tween.prototype.init;
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	if ( timer() && jQuery.timers.push( timer ) ) {
+		jQuery.fx.start();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+	// Default speed
+	_default: 400
+};
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+jQuery.fn.offset = function( options ) {
+	if ( arguments.length ) {
+		return options === undefined ?
+			this :
+			this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+	}
+
+	var docElem, win,
+		box = { top: 0, left: 0 },
+		elem = this[ 0 ],
+		doc = elem && elem.ownerDocument;
+
+	if ( !doc ) {
+		return;
+	}
+
+	docElem = doc.documentElement;
+
+	// Make sure it's not a disconnected DOM node
+	if ( !jQuery.contains( docElem, elem ) ) {
+		return box;
+	}
+
+	// If we don't have gBCR, just use 0,0 rather than error
+	// BlackBerry 5, iOS 3 (original iPhone)
+	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
+		box = elem.getBoundingClientRect();
+	}
+	win = getWindow( doc );
+	return {
+		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+	};
+};
+
+jQuery.offset = {
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+
+	position: function() {
+		if ( !this[ 0 ] ) {
+			return;
+		}
+
+		var offsetParent, offset,
+			parentOffset = { top: 0, left: 0 },
+			elem = this[ 0 ];
+
+		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+			// we assume that getBoundingClientRect is available when computed position is fixed
+			offset = elem.getBoundingClientRect();
+		} else {
+			// Get *real* offsetParent
+			offsetParent = this.offsetParent();
+
+			// Get correct offsets
+			offset = this.offset();
+			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+				parentOffset = offsetParent.offset();
+			}
+
+			// Add offsetParent borders
+			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+		}
+
+		// Subtract parent offsets and element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		return {
+			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.documentElement;
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent || document.documentElement;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+	var top = /Y/.test( prop );
+
+	jQuery.fn[ method ] = function( val ) {
+		return jQuery.access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? (prop in win) ? win[ prop ] :
+					win.document.documentElement[ method ] :
+					elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					top ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+		// margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return jQuery.access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( jQuery.isWindow( elem ) ) {
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	});
+});
+// Limit scope pollution from any deprecated API
+// (function() {
+
+// })();
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+	define( "jquery", [], function () { return jQuery; } );
+}
+
+})( window );
diff --git a/extensions/themes/silverblue/scripts/libraries/jquery-migrate-1.3.0.js b/extensions/themes/silverblue/scripts/libraries/jquery-migrate-1.3.0.js
new file mode 100644
index 000000000..df4b370a5
--- /dev/null
+++ b/extensions/themes/silverblue/scripts/libraries/jquery-migrate-1.3.0.js
@@ -0,0 +1,702 @@
+/*!
+ * jQuery Migrate - v1.3.0 - 2016-01-13
+ * Copyright jQuery Foundation and other contributors
+ */
+(function( jQuery, window, undefined ) {
+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
+
+
+jQuery.migrateVersion = "1.3.0";
+
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to true to prevent console output; migrateWarnings still maintained
+// jQuery.migrateMute = false;
+
+// Show a message on the console so devs know we're active
+if ( !jQuery.migrateMute && window.console && window.console.log ) {
+	window.console.log("JQMIGRATE: Logging is active");
+}
+
+// Set to false to disable traces that appear with warnings
+if ( jQuery.migrateTrace === undefined ) {
+	jQuery.migrateTrace = true;
+}
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+	warnedAbout = {};
+	jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg) {
+	var console = window.console;
+	if ( !warnedAbout[ msg ] ) {
+		warnedAbout[ msg ] = true;
+		jQuery.migrateWarnings.push( msg );
+		if ( console && console.warn && !jQuery.migrateMute ) {
+			console.warn( "JQMIGRATE: " + msg );
+			if ( jQuery.migrateTrace && console.trace ) {
+				console.trace();
+			}
+		}
+	}
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+	if ( Object.defineProperty ) {
+		// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
+		// allow property to be overwritten in case some other plugin wants it
+		try {
+			Object.defineProperty( obj, prop, {
+				configurable: true,
+				enumerable: true,
+				get: function() {
+					migrateWarn( msg );
+					return value;
+				},
+				set: function( newValue ) {
+					migrateWarn( msg );
+					value = newValue;
+				}
+			});
+			return;
+		} catch( err ) {
+			// IE8 is a dope about Object.defineProperty, can't warn there
+		}
+	}
+
+	// Non-ES5 (or broken) browser; just set the property
+	jQuery._definePropertyBroken = true;
+	obj[ prop ] = value;
+}
+
+if ( document.compatMode === "BackCompat" ) {
+	// jQuery has never supported or tested Quirks Mode
+	migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
+	oldAttr = jQuery.attr,
+	valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
+		function() { return null; },
+	valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
+		function() { return undefined; },
+	rnoType = /^(?:input|button)$/i,
+	rnoAttrNodeType = /^[238]$/,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	ruseDefault = /^(?:checked|selected)$/i;
+
+// jQuery.attrFn
+migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
+
+jQuery.attr = function( elem, name, value, pass ) {
+	var lowerName = name.toLowerCase(),
+		nType = elem && elem.nodeType;
+
+	if ( pass ) {
+		// Since pass is used internally, we only warn for new jQuery
+		// versions where there isn't a pass arg in the formal params
+		if ( oldAttr.length < 4 ) {
+			migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
+		}
+		if ( elem && !rnoAttrNodeType.test( nType ) &&
+			(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
+			return jQuery( elem )[ name ]( value );
+		}
+	}
+
+	// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
+	// for disconnected elements we don't warn on $( "<button>", { type: "button" } ).
+	if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
+		migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
+	}
+
+	// Restore boolHook for boolean property/attribute synchronization
+	if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
+		jQuery.attrHooks[ lowerName ] = {
+			get: function( elem, name ) {
+				// Align boolean attributes with corresponding properties
+				// Fall back to attribute presence where some booleans are not supported
+				var attrNode,
+					property = jQuery.prop( elem, name );
+				return property === true || typeof property !== "boolean" &&
+					( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+
+					name.toLowerCase() :
+					undefined;
+			},
+			set: function( elem, value, name ) {
+				var propName;
+				if ( value === false ) {
+					// Remove boolean attributes when set to false
+					jQuery.removeAttr( elem, name );
+				} else {
+					// value is true since we know at this point it's type boolean and not false
+					// Set boolean attributes to the same name and set the DOM property
+					propName = jQuery.propFix[ name ] || name;
+					if ( propName in elem ) {
+						// Only set the IDL specifically if it already exists on the element
+						elem[ propName ] = true;
+					}
+
+					elem.setAttribute( name, name.toLowerCase() );
+				}
+				return name;
+			}
+		};
+
+		// Warn only for attributes that can remain distinct from their properties post-1.9
+		if ( ruseDefault.test( lowerName ) ) {
+			migrateWarn( "jQuery.fn.attr('" + lowerName + "') might use property instead of attribute" );
+		}
+	}
+
+	return oldAttr.call( jQuery, elem, name, value );
+};
+
+// attrHooks: value
+jQuery.attrHooks.value = {
+	get: function( elem, name ) {
+		var nodeName = ( elem.nodeName || "" ).toLowerCase();
+		if ( nodeName === "button" ) {
+			return valueAttrGet.apply( this, arguments );
+		}
+		if ( nodeName !== "input" && nodeName !== "option" ) {
+			migrateWarn("jQuery.fn.attr('value') no longer gets properties");
+		}
+		return name in elem ?
+			elem.value :
+			null;
+	},
+	set: function( elem, value ) {
+		var nodeName = ( elem.nodeName || "" ).toLowerCase();
+		if ( nodeName === "button" ) {
+			return valueAttrSet.apply( this, arguments );
+		}
+		if ( nodeName !== "input" && nodeName !== "option" ) {
+			migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
+		}
+		// Does not return so that setAttribute is also used
+		elem.value = value;
+	}
+};
+
+
+var matched, browser,
+	oldInit = jQuery.fn.init,
+	oldParseJSON = jQuery.parseJSON,
+	rspaceAngle = /^\s*</,
+	// Note: XSS check is done below after string is trimmed
+	rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
+
+// $(html) "looks like html" rule change
+jQuery.fn.init = function( selector, context, rootjQuery ) {
+	var match, ret;
+
+	if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
+			(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
+		// This is an HTML string according to the "old" rules; is it still?
+		if ( !rspaceAngle.test( selector ) ) {
+			migrateWarn("$(html) HTML strings must start with '<' character");
+		}
+		if ( match[ 3 ] ) {
+			migrateWarn("$(html) HTML text after last tag is ignored");
+		}
+
+		// Consistently reject any HTML-like string starting with a hash (#9521)
+		// Note that this may break jQuery 1.6.x code that otherwise would work.
+		if ( match[ 0 ].charAt( 0 ) === "#" ) {
+			migrateWarn("HTML string cannot start with a '#' character");
+			jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+		}
+		// Now process using loose rules; let pre-1.8 play too
+		if ( context && context.context ) {
+			// jQuery object as context; parseHTML expects a DOM object
+			context = context.context;
+		}
+		if ( jQuery.parseHTML ) {
+			return oldInit.call( this,
+					jQuery.parseHTML( match[ 2 ], context && context.ownerDocument ||
+						context || document, true ), context, rootjQuery );
+		}
+	}
+
+	// jQuery( "#" ) is a bogus ID selector, but it returned an empty set before jQuery 3.0
+	if ( selector === "#" ) {
+		migrateWarn( "jQuery( '#' ) is not a valid selector" );
+		selector = [];
+	}
+
+	ret = oldInit.apply( this, arguments );
+
+	// Fill in selector and context properties so .live() works
+	if ( selector && selector.selector !== undefined ) {
+		// A jQuery object, copy its properties
+		ret.selector = selector.selector;
+		ret.context = selector.context;
+
+	} else {
+		ret.selector = typeof selector === "string" ? selector : "";
+		if ( selector ) {
+			ret.context = selector.nodeType? selector : context || document;
+		}
+	}
+
+	return ret;
+};
+jQuery.fn.init.prototype = jQuery.fn;
+
+// Let $.parseJSON(falsy_value) return null
+jQuery.parseJSON = function( json ) {
+	if ( !json ) {
+		migrateWarn("jQuery.parseJSON requires a valid JSON string");
+		return null;
+	}
+	return oldParseJSON.apply( this, arguments );
+};
+
+jQuery.uaMatch = function( ua ) {
+	ua = ua.toLowerCase();
+
+	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+		/(msie) ([\w.]+)/.exec( ua ) ||
+		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+		[];
+
+	return {
+		browser: match[ 1 ] || "",
+		version: match[ 2 ] || "0"
+	};
+};
+
+// Don't clobber any existing jQuery.browser in case it's different
+if ( !jQuery.browser ) {
+	matched = jQuery.uaMatch( navigator.userAgent );
+	browser = {};
+
+	if ( matched.browser ) {
+		browser[ matched.browser ] = true;
+		browser.version = matched.version;
+	}
+
+	// Chrome is Webkit, but Webkit is also Safari.
+	if ( browser.chrome ) {
+		browser.webkit = true;
+	} else if ( browser.webkit ) {
+		browser.safari = true;
+	}
+
+	jQuery.browser = browser;
+}
+
+// Warn if the code tries to get jQuery.browser
+migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
+
+// jQuery.boxModel deprecated in 1.3, jQuery.support.boxModel deprecated in 1.7
+jQuery.boxModel = jQuery.support.boxModel = (document.compatMode === "CSS1Compat");
+migrateWarnProp( jQuery, "boxModel", jQuery.boxModel, "jQuery.boxModel is deprecated" );
+migrateWarnProp( jQuery.support, "boxModel", jQuery.support.boxModel, "jQuery.support.boxModel is deprecated" );
+
+jQuery.sub = function() {
+	function jQuerySub( selector, context ) {
+		return new jQuerySub.fn.init( selector, context );
+	}
+	jQuery.extend( true, jQuerySub, this );
+	jQuerySub.superclass = this;
+	jQuerySub.fn = jQuerySub.prototype = this();
+	jQuerySub.fn.constructor = jQuerySub;
+	jQuerySub.sub = this.sub;
+	jQuerySub.fn.init = function init( selector, context ) {
+		var instance = jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		return instance instanceof jQuerySub ?
+			instance :
+			jQuerySub( instance );
+	};
+	jQuerySub.fn.init.prototype = jQuerySub.fn;
+	var rootjQuerySub = jQuerySub(document);
+	migrateWarn( "jQuery.sub() is deprecated" );
+	return jQuerySub;
+};
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
+	return this.length;
+};
+
+
+var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+if ( jQuery.swap ) {
+	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+		if ( oldHook ) {
+			jQuery.cssHooks[ name ].get = function() {
+				var ret;
+
+				internalSwapCall = true;
+				ret = oldHook.apply( this, arguments );
+				internalSwapCall = false;
+				return ret;
+			};
+		}
+	});
+}
+
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	if ( !internalSwapCall ) {
+		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+	}
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+// Ensure that $.ajax gets the new parseJSON defined in core.js
+jQuery.ajaxSetup({
+	converters: {
+		"text json": jQuery.parseJSON
+	}
+});
+
+
+var oldFnData = jQuery.fn.data;
+
+jQuery.fn.data = function( name ) {
+	var ret, evt,
+		elem = this[0];
+
+	// Handles 1.7 which has this behavior and 1.8 which doesn't
+	if ( elem && name === "events" && arguments.length === 1 ) {
+		ret = jQuery.data( elem, name );
+		evt = jQuery._data( elem, name );
+		if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
+			migrateWarn("Use of jQuery.fn.data('events') is deprecated");
+			return evt;
+		}
+	}
+	return oldFnData.apply( this, arguments );
+};
+
+
+var rscriptType = /\/(java|ecma)script/i;
+
+// Since jQuery.clean is used internally on older versions, we only shim if it's missing
+if ( !jQuery.clean ) {
+	jQuery.clean = function( elems, context, fragment, scripts ) {
+		// Set context per 1.8 logic
+		context = context || document;
+		context = !context.nodeType && context[0] || context;
+		context = context.ownerDocument || context;
+
+		migrateWarn("jQuery.clean() is deprecated");
+
+		var i, elem, handleScript, jsTags,
+			ret = [];
+
+		jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
+
+		// Complex logic lifted directly from jQuery 1.8
+		if ( fragment ) {
+			// Special handling of each script element
+			handleScript = function( elem ) {
+				// Check if we consider it executable
+				if ( !elem.type || rscriptType.test( elem.type ) ) {
+					// Detach the script and store it in the scripts array (if provided) or the fragment
+					// Return truthy to indicate that it has been handled
+					return scripts ?
+						scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+						fragment.appendChild( elem );
+				}
+			};
+
+			for ( i = 0; (elem = ret[i]) != null; i++ ) {
+				// Check if we're done after handling an executable script
+				if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+					// Append to fragment and handle embedded scripts
+					fragment.appendChild( elem );
+					if ( typeof elem.getElementsByTagName !== "undefined" ) {
+						// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+						jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+						// Splice the scripts into ret after their former ancestor and advance our index beyond them
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+						i += jsTags.length;
+					}
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var eventAdd = jQuery.event.add,
+	eventRemove = jQuery.event.remove,
+	eventTrigger = jQuery.event.trigger,
+	oldToggle = jQuery.fn.toggle,
+	oldLive = jQuery.fn.live,
+	oldDie = jQuery.fn.die,
+	oldLoad = jQuery.fn.load,
+	ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
+	rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
+	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+	hoverHack = function( events ) {
+		if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
+			return events;
+		}
+		if ( rhoverHack.test( events ) ) {
+			migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
+		}
+		return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+	};
+
+// Event props removed in 1.9, put them back if needed; no practical way to warn them
+if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
+	jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
+}
+
+// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
+if ( jQuery.event.dispatch ) {
+	migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
+}
+
+// Support for 'hover' pseudo-event and ajax event warnings
+jQuery.event.add = function( elem, types, handler, data, selector ){
+	if ( elem !== document && rajaxEvent.test( types ) ) {
+		migrateWarn( "AJAX events should be attached to document: " + types );
+	}
+	eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
+};
+jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
+	eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
+};
+
+jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+	jQuery.fn[ name ] = function() {
+		var args = Array.prototype.slice.call( arguments, 0 );
+		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+		// If this is an ajax load() the first arg should be the string URL;
+		// technically this could also be the "Anything" arg of the event .load()
+		// which just goes to show why this dumb signature has been deprecated!
+		// jQuery custom builds that exclude the Ajax module justifiably die here.
+		if ( name === "load" && typeof arguments[ 0 ] === "string" ) {
+			return oldLoad.apply( this, arguments );
+		}
+
+		args.splice( 0, 0, name );
+		if ( arguments.length ) {
+			return this.bind.apply( this, args );
+		}
+
+		// Use .triggerHandler here because:
+		// - load and unload events don't need to bubble, only applied to window or image
+		// - error event should not bubble to window, although it does pre-1.7
+		// See http://bugs.jquery.com/ticket/11820
+		this.triggerHandler.apply( this, args );
+		return this;
+	};
+
+});
+
+jQuery.fn.toggle = function( fn, fn2 ) {
+
+	// Don't mess with animation or css toggles
+	if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
+		return oldToggle.apply( this, arguments );
+	}
+	migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
+
+	// Save reference to arguments for access in closure
+	var args = arguments,
+		guid = fn.guid || jQuery.guid++,
+		i = 0,
+		toggler = function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		};
+
+	// link all the functions, so any of them can unbind this click handler
+	toggler.guid = guid;
+	while ( i < args.length ) {
+		args[ i++ ].guid = guid;
+	}
+
+	return this.click( toggler );
+};
+
+jQuery.fn.live = function( types, data, fn ) {
+	migrateWarn("jQuery.fn.live() is deprecated");
+	if ( oldLive ) {
+		return oldLive.apply( this, arguments );
+	}
+	jQuery( this.context ).on( types, this.selector, data, fn );
+	return this;
+};
+
+jQuery.fn.die = function( types, fn ) {
+	migrateWarn("jQuery.fn.die() is deprecated");
+	if ( oldDie ) {
+		return oldDie.apply( this, arguments );
+	}
+	jQuery( this.context ).off( types, this.selector || "**", fn );
+	return this;
+};
+
+// Turn global events into document-triggered events
+jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
+	if ( !elem && !rajaxEvent.test( event ) ) {
+		migrateWarn( "Global events are undocumented and deprecated" );
+	}
+	return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
+};
+jQuery.each( ajaxEvents.split("|"),
+	function( _, name ) {
+		jQuery.event.special[ name ] = {
+			setup: function() {
+				var elem = this;
+
+				// The document needs no shimming; must be !== for oldIE
+				if ( elem !== document ) {
+					jQuery.event.add( document, name + "." + jQuery.guid, function() {
+						jQuery.event.trigger( name, Array.prototype.slice.call( arguments, 1 ), elem, true );
+					});
+					jQuery._data( this, name, jQuery.guid++ );
+				}
+				return false;
+			},
+			teardown: function() {
+				if ( this !== document ) {
+					jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
+				}
+				return false;
+			}
+		};
+	}
+);
+
+jQuery.event.special.ready = {
+	setup: function() { migrateWarn( "'ready' event is deprecated" ); }
+};
+
+var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
+	oldFind = jQuery.fn.find;
+
+jQuery.fn.andSelf = function() {
+	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+	return oldSelf.apply( this, arguments );
+};
+
+jQuery.fn.find = function( selector ) {
+	var ret = oldFind.apply( this, arguments );
+	ret.context = this.context;
+	ret.selector = this.selector ? this.selector + " " + selector : selector;
+	return ret;
+};
+
+
+// jQuery 1.6 did not support Callbacks, do not warn there
+if ( jQuery.Callbacks ) {
+
+	var oldDeferred = jQuery.Deferred,
+		tuples = [
+			// action, add listener, callbacks, .then handlers, final state
+			[ "resolve", "done", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "resolved" ],
+			[ "reject", "fail", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "rejected" ],
+			[ "notify", "progress", jQuery.Callbacks("memory"),
+				jQuery.Callbacks("memory") ]
+		];
+
+	jQuery.Deferred = function( func ) {
+		var deferred = oldDeferred(),
+			promise = deferred.promise();
+
+		deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+			var fns = arguments;
+
+			migrateWarn( "deferred.pipe() is deprecated" );
+
+			return jQuery.Deferred(function( newDefer ) {
+				jQuery.each( tuples, function( i, tuple ) {
+					var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+					// deferred.done(function() { bind to newDefer or newDefer.resolve })
+					// deferred.fail(function() { bind to newDefer or newDefer.reject })
+					// deferred.progress(function() { bind to newDefer or newDefer.notify })
+					deferred[ tuple[1] ](function() {
+						var returned = fn && fn.apply( this, arguments );
+						if ( returned && jQuery.isFunction( returned.promise ) ) {
+							returned.promise()
+								.done( newDefer.resolve )
+								.fail( newDefer.reject )
+								.progress( newDefer.notify );
+						} else {
+							newDefer[ tuple[ 0 ] + "With" ](
+								this === promise ? newDefer.promise() : this,
+								fn ? [ returned ] : arguments
+							);
+						}
+					});
+				});
+				fns = null;
+			}).promise();
+
+		};
+
+		deferred.isResolved = function() {
+			migrateWarn( "deferred.isResolved is deprecated" );
+			return deferred.state() === "resolved";
+		};
+
+		deferred.isRejected = function() {
+			migrateWarn( "deferred.isRejected is deprecated" );
+			return deferred.state() === "rejected";
+		};
+
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		return deferred;
+	};
+
+}
+
+})( jQuery, window );
diff --git a/extensions/themes/silverblue/scripts/libraries/jquery-ui-1.8.22.js b/extensions/themes/silverblue/scripts/libraries/jquery-ui-1.8.22.js
new file mode 100644
index 000000000..ddb21bce8
--- /dev/null
+++ b/extensions/themes/silverblue/scripts/libraries/jquery-ui-1.8.22.js
@@ -0,0 +1,11529 @@
+/*! jQuery UI - v1.8.22 - 2012-07-24
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js, jquery.effects.blind.js, jquery.effects.bounce.js, jquery.effects.clip.js, jquery.effects.drop.js, jquery.effects.explode.js, jquery.effects.fade.js, jquery.effects.fold.js, jquery.effects.highlight.js, jquery.effects.pulsate.js, jquery.effects.scale.js, jquery.effects.shake.js, jquery.effects.slide.js, jquery.effects.transfer.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.tabs.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+
+(function( $, undefined ) {
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+	return;
+}
+
+$.extend( $.ui, {
+	version: "1.8.22",
+
+	keyCode: {
+		ALT: 18,
+		BACKSPACE: 8,
+		CAPS_LOCK: 20,
+		COMMA: 188,
+		COMMAND: 91,
+		COMMAND_LEFT: 91, // COMMAND
+		COMMAND_RIGHT: 93,
+		CONTROL: 17,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		INSERT: 45,
+		LEFT: 37,
+		MENU: 93, // COMMAND_RIGHT
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SHIFT: 16,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38,
+		WINDOWS: 91 // COMMAND
+	}
+});
+
+// plugins
+$.fn.extend({
+	propAttr: $.fn.prop || $.fn.attr,
+
+	_focus: $.fn.focus,
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
+				var elem = this;
+				setTimeout(function() {
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
+	},
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+// support: jQuery <1.8
+if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
+	$.each( [ "Width", "Height" ], function( i, name ) {
+		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+			type = name.toLowerCase(),
+			orig = {
+				innerWidth: $.fn.innerWidth,
+				innerHeight: $.fn.innerHeight,
+				outerWidth: $.fn.outerWidth,
+				outerHeight: $.fn.outerHeight
+			};
+
+		function reduce( elem, size, border, margin ) {
+			$.each( side, function() {
+				size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0;
+				if ( border ) {
+					size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0;
+				}
+				if ( margin ) {
+					size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0;
+				}
+			});
+			return size;
+		}
+
+		$.fn[ "inner" + name ] = function( size ) {
+			if ( size === undefined ) {
+				return orig[ "inner" + name ].call( this );
+			}
+
+			return this.each(function() {
+				$( this ).css( type, reduce( this, size ) + "px" );
+			});
+		};
+
+		$.fn[ "outer" + name] = function( size, margin ) {
+			if ( typeof size !== "number" ) {
+				return orig[ "outer" + name ].call( this, size );
+			}
+
+			return this.each(function() {
+				$( this).css( type, reduce( this, size, true, margin ) + "px" );
+			});
+		};
+	});
+}
+
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+	var nodeName = element.nodeName.toLowerCase();
+	if ( "area" === nodeName ) {
+		var map = element.parentNode,
+			mapName = map.name,
+			img;
+		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+			return false;
+		}
+		img = $( "img[usemap=#" + mapName + "]" )[0];
+		return !!img && visible( img );
+	}
+	return ( /input|select|textarea|button|object/.test( nodeName )
+		? !element.disabled
+		: "a" == nodeName
+			? element.href || isTabIndexNotNaN
+			: isTabIndexNotNaN)
+		// the element and all of its ancestors must be visible
+		&& visible( element );
+}
+
+function visible( element ) {
+	return !$( element ).parents().andSelf().filter(function() {
+		return $.curCSS( this, "visibility" ) === "hidden" ||
+			$.expr.filters.hidden( this );
+	}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: $.expr.createPseudo ?
+		$.expr.createPseudo(function( dataName ) {
+			return function( elem ) {
+				return !!$.data( elem, dataName );
+			};
+		}) :
+		// support: jQuery <1.8
+		function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
+		},
+
+	focusable: function( element ) {
+		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" ),
+			isTabIndexNaN = isNaN( tabIndex );
+		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
+	}
+});
+
+// support
+$(function() {
+	var body = document.body,
+		div = body.appendChild( div = document.createElement( "div" ) );
+
+	// access offsetHeight before setting the style to prevent a layout bug
+	// in IE 9 which causes the elemnt to continue to take up space even
+	// after it is removed from the DOM (#8026)
+	div.offsetHeight;
+
+	$.extend( div.style, {
+		minHeight: "100px",
+		height: "auto",
+		padding: 0,
+		borderWidth: 0
+	});
+
+	$.support.minHeight = div.offsetHeight === 100;
+	$.support.selectstart = "onselectstart" in div;
+
+	// set display to none to avoid a layout bug in IE
+	// http://dev.jquery.com/ticket/4014
+	body.removeChild( div ).style.display = "none";
+});
+
+// jQuery <1.4.3 uses curCSS, in 1.4.3 - 1.7.2 curCSS = css, 1.8+ only has css
+if ( !$.curCSS ) {
+	$.curCSS = $.css;
+}
+
+
+
+
+
+// deprecated
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var proto = $.ui[ module ].prototype;
+			for ( var i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode ) {
+				return;
+			}
+	
+			for ( var i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+	
+	// will be deprecated when we switch to jQuery 1.4 - use jQuery.contains()
+	contains: function( a, b ) {
+		return document.compareDocumentPosition ?
+			a.compareDocumentPosition( b ) & 16 :
+			a !== b && a.contains( b );
+	},
+	
+	// only used by resizable
+	hasScroll: function( el, a ) {
+	
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+	
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+	
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+	
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	},
+	
+	// these are odd functions, fix the API or move into individual plugins
+	isOverAxis: function( x, reference, size ) {
+		//Determines when x coordinate is over "b" element axis
+		return ( x > reference ) && ( x < ( reference + size ) );
+	},
+	isOver: function( y, x, top, left, height, width ) {
+		//Determines when x, y coordinates is over "b" element
+		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
+	}
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+// jQuery 1.4+
+if ( $.cleanData ) {
+	var _cleanData = $.cleanData;
+	$.cleanData = function( elems ) {
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			try {
+				$( elem ).triggerHandler( "remove" );
+			// http://bugs.jquery.com/ticket/8235
+			} catch( e ) {}
+		}
+		_cleanData( elems );
+	};
+} else {
+	var _remove = $.fn.remove;
+	$.fn.remove = function( selector, keepData ) {
+		return this.each(function() {
+			if ( !keepData ) {
+				if ( !selector || $.filter( selector, [ this ] ).length ) {
+					$( "*", this ).add( [ this ] ).each(function() {
+						try {
+							$( this ).triggerHandler( "remove" );
+						// http://bugs.jquery.com/ticket/8235
+						} catch( e ) {}
+					});
+				}
+			}
+			return _remove.call( $(this), selector, keepData );
+		});
+	};
+}
+
+$.widget = function( name, base, prototype ) {
+	var namespace = name.split( "." )[ 0 ],
+		fullName;
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName ] = function( elem ) {
+		return !!$.data( elem, name );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	$[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without initializing for simple inheritance
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+
+	var basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+//	$.each( basePrototype, function( key, val ) {
+//		if ( $.isPlainObject(val) ) {
+//			basePrototype[ key ] = $.extend( {}, val );
+//		}
+//	});
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
+	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
+		namespace: namespace,
+		widgetName: name,
+		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
+		widgetBaseClass: fullName
+	}, prototype );
+
+	$.widget.bridge( name, $[ namespace ][ name ] );
+};
+
+$.widget.bridge = function( name, object ) {
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = Array.prototype.slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.extend.apply( null, [ true, options ].concat(args) ) :
+			options;
+
+		// prevent calls to internal methods
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
+			return returnValue;
+		}
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var instance = $.data( this, name ),
+					methodValue = instance && $.isFunction( instance[options] ) ?
+						instance[ options ].apply( instance, args ) :
+						instance;
+				// TODO: add this back in 1.9 and use $.error() (see #5972)
+//				if ( !instance ) {
+//					throw "cannot call methods on " + name + " prior to initialization; " +
+//						"attempted to call method '" + options + "'";
+//				}
+//				if ( !$.isFunction( instance[options] ) ) {
+//					throw "no such method '" + options + "' for " + name + " widget instance";
+//				}
+//				var methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, name, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( options, element ) {
+	// allow instantiation without initializing for simple inheritance
+	if ( arguments.length ) {
+		this._createWidget( options, element );
+	}
+};
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	options: {
+		disabled: false
+	},
+	_createWidget: function( options, element ) {
+		// $.widget.bridge stores the plugin instance, but we do it anyway
+		// so that it's stored even before the _create function runs
+		$.data( element, this.widgetName, this );
+		this.element = $( element );
+		this.options = $.extend( true, {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		var self = this;
+		this.element.bind( "remove." + this.widgetName, function() {
+			self.destroy();
+		});
+
+		this._create();
+		this._trigger( "create" );
+		this._init();
+	},
+	_getCreateOptions: function() {
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+	},
+	_create: function() {},
+	_init: function() {},
+
+	destroy: function() {
+		this.element
+			.unbind( "." + this.widgetName )
+			.removeData( this.widgetName );
+		this.widget()
+			.unbind( "." + this.widgetName )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetBaseClass + "-disabled " +
+				"ui-state-disabled" );
+	},
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.extend( {}, this.options );
+		}
+
+		if  (typeof key === "string" ) {
+			if ( value === undefined ) {
+				return this.options[ key ];
+			}
+			options = {};
+			options[ key ] = value;
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var self = this;
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+		});
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				[ value ? "addClass" : "removeClass"](
+					this.widgetBaseClass + "-disabled" + " " +
+					"ui-state-disabled" )
+				.attr( "aria-disabled", value );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_trigger: function( type, event, data ) {
+		var prop, orig,
+			callback = this.options[ type ];
+
+		data = data || {};
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		// the original event may come from any element
+		// so we need to reset the target on the new event
+		event.target = this.element[ 0 ];
+
+		// copy original event properties over to the new event
+		orig = event.originalEvent;
+		if ( orig ) {
+			for ( prop in orig ) {
+				if ( !( prop in event ) ) {
+					event[ prop ] = orig[ prop ];
+				}
+			}
+		}
+
+		this.element.trigger( event, data );
+
+		return !( $.isFunction(callback) &&
+			callback.call( this.element[0], event, data ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function( e ) {
+	mouseHandled = false;
+});
+
+$.widget("ui.mouse", {
+	options: {
+		cancel: ':input,option',
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var self = this;
+
+		this.element
+			.bind('mousedown.'+this.widgetName, function(event) {
+				return self._mouseDown(event);
+			})
+			.bind('click.'+this.widgetName, function(event) {
+				if (true === $.data(event.target, self.widgetName + '.preventClickEvent')) {
+				    $.removeData(event.target, self.widgetName + '.preventClickEvent');
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind('.'+this.widgetName);
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		if( mouseHandled ) { return };
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var self = this,
+			btnIsLeft = (event.which == 1),
+			// event.target.nodeName works around a bug in IE 8 with
+			// disabled inputs (#7620)
+			elIsCancel = (typeof this.options.cancel == "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				self.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// Click event may never have fired (Gecko & Opera)
+		if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
+			$.removeData(event.target, this.widgetName + '.preventClickEvent');
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return self._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return self._mouseUp(event);
+		};
+		$(document)
+			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+		
+		mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target == this._mouseDownEvent.target) {
+			    $.data(event.target, this.widgetName + '.preventClickEvent', true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(event) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(event) {},
+	_mouseDrag: function(event) {},
+	_mouseStop: function(event) {},
+	_mouseCapture: function(event) { return true; }
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.draggable", $.ui.mouse, {
+	widgetEventPrefix: "drag",
+	options: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scope: "default",
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false
+	},
+	_create: function() {
+
+		if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
+			this.element[0].style.position = 'relative';
+
+		(this.options.addClasses && this.element.addClass("ui-draggable"));
+		(this.options.disabled && this.element.addClass("ui-draggable-disabled"));
+
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+		if(!this.element.data('draggable')) return;
+		this.element
+			.removeData("draggable")
+			.unbind(".draggable")
+			.removeClass("ui-draggable"
+				+ " ui-draggable-dragging"
+				+ " ui-draggable-disabled");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+
+		var o = this.options;
+
+		// among others, prevent a drag on a resizable-handle
+		if (this.helper || o.disabled || $(event.target).is('.ui-resizable-handle'))
+			return false;
+
+		//Quit if we're not on a valid handle
+		this.handle = this._getHandle(event);
+		if (!this.handle)
+			return false;
+		
+		if ( o.iframeFix ) {
+			$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+				$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
+				.css({
+					width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+					position: "absolute", opacity: "0.001", zIndex: 1000
+				})
+				.css($(this).offset())
+				.appendTo("body");
+			});
+		}
+
+		return true;
+
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options;
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		this.helper.addClass("ui-draggable-dragging");
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		//If ddmanager is used for droppables, set the global draggable
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Store the helper's css position
+		this.cssPosition = this.helper.css("position");
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.positionAbs = this.element.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this.position = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		//Trigger event + callbacks
+		if(this._trigger("start", event) === false) {
+			this._clear();
+			return false;
+		}
+
+		//Recache the helper size
+		this._cacheHelperProportions();
+
+		//Prepare the droppable offsets
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		
+		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		
+		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+		if ( $.ui.ddmanager ) $.ui.ddmanager.dragStart(this, event);
+		
+		return true;
+	},
+
+	_mouseDrag: function(event, noPropagation) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Call plugins and callbacks and use the resulting position if something is returned
+		if (!noPropagation) {
+			var ui = this._uiHash();
+			if(this._trigger('drag', event, ui) === false) {
+				this._mouseUp({});
+				return false;
+			}
+			this.position = ui.position;
+		}
+
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		//If we are using droppables, inform the manager about the drop
+		var dropped = false;
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			dropped = $.ui.ddmanager.drop(this, event);
+
+		//if a drop comes from outside (a sortable)
+		if(this.dropped) {
+			dropped = this.dropped;
+			this.dropped = false;
+		}
+		
+		//if the original element is no longer in the DOM don't bother to continue (see #8269)
+		var element = this.element[0], elementInDom = false;
+		while ( element && (element = element.parentNode) ) {
+			if (element == document ) {
+				elementInDom = true;
+			}
+		}
+		if ( !elementInDom && this.options.helper === "original" )
+			return false;
+
+		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+			var self = this;
+			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+				if(self._trigger("stop", event) !== false) {
+					self._clear();
+				}
+			});
+		} else {
+			if(this._trigger("stop", event) !== false) {
+				this._clear();
+			}
+		}
+
+		return false;
+	},
+	
+	_mouseUp: function(event) {
+		if (this.options.iframeFix === true) {
+			$("div.ui-draggable-iframeFix").each(function() { 
+				this.parentNode.removeChild(this); 
+			}); //Remove frame helpers
+		}
+		
+		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+		if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);
+		
+		return $.ui.mouse.prototype._mouseUp.call(this, event);
+	},
+	
+	cancel: function() {
+		
+		if(this.helper.is(".ui-draggable-dragging")) {
+			this._mouseUp({});
+		} else {
+			this._clear();
+		}
+		
+		return this;
+		
+	},
+
+	_getHandle: function(event) {
+
+		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
+		$(this.options.handle, this.element)
+			.find("*")
+			.andSelf()
+			.each(function() {
+				if(this == event.target) handle = true;
+			});
+
+		return handle;
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone().removeAttr('id') : this.element);
+
+		if(!helper.parents('body').length)
+			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
+
+		if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
+			helper.css("position", "absolute");
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.element.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.element.css("marginLeft"),10) || 0),
+			top: (parseInt(this.element.css("marginTop"),10) || 0),
+			right: (parseInt(this.element.css("marginRight"),10) || 0),
+			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			o.containment == 'document' ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
+			o.containment == 'document' ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
+		        var c = $(o.containment);
+			var ce = c[0]; if(!ce) return;
+			var co = c.offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
+				(parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
+				(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
+				(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
+			];
+			this.relative_container = c;
+
+		} else if(o.containment.constructor == Array) {
+			this.containment = o.containment;
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+		         var containment;
+		         if(this.containment) {
+				 if (this.relative_container){
+				     var co = this.relative_container.offset();
+				     containment = [ this.containment[0] + co.left,
+						     this.containment[1] + co.top,
+						     this.containment[2] + co.left,
+						     this.containment[3] + co.top ];
+				 }
+				 else {
+				     containment = this.containment;
+				 }
+
+				if(event.pageX - this.offset.click.left < containment[0]) pageX = containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < containment[1]) pageY = containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > containment[2]) pageX = containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > containment[3]) pageY = containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
+				var top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
+				pageY = containment ? (!(top - this.offset.click.top < containment[1] || top - this.offset.click.top > containment[3]) ? top : (!(top - this.offset.click.top < containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
+				pageX = containment ? (!(left - this.offset.click.left < containment[0] || left - this.offset.click.left > containment[2]) ? left : (!(left - this.offset.click.left < containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_clear: function() {
+		this.helper.removeClass("ui-draggable-dragging");
+		if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove();
+		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
+		this.helper = null;
+		this.cancelHelperRemoval = false;
+	},
+
+	// From now on bulk stuff - mainly helpers
+
+	_trigger: function(type, event, ui) {
+		ui = ui || this._uiHash();
+		$.ui.plugin.call(this, type, [event, ui]);
+		if(type == "drag") this.positionAbs = this._convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
+		return $.Widget.prototype._trigger.call(this, type, event, ui);
+	},
+
+	plugins: {},
+
+	_uiHash: function(event) {
+		return {
+			helper: this.helper,
+			position: this.position,
+			originalPosition: this.originalPosition,
+			offset: this.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.draggable, {
+	version: "1.8.22"
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+	start: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options,
+			uiSortable = $.extend({}, ui, { item: inst.element });
+		inst.sortables = [];
+		$(o.connectToSortable).each(function() {
+			var sortable = $.data(this, 'sortable');
+			if (sortable && !sortable.options.disabled) {
+				inst.sortables.push({
+					instance: sortable,
+					shouldRevert: sortable.options.revert
+				});
+				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
+				sortable._trigger("activate", event, uiSortable);
+			}
+		});
+
+	},
+	stop: function(event, ui) {
+
+		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+		var inst = $(this).data("draggable"),
+			uiSortable = $.extend({}, ui, { item: inst.element });
+
+		$.each(inst.sortables, function() {
+			if(this.instance.isOver) {
+
+				this.instance.isOver = 0;
+
+				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
+				if(this.shouldRevert) this.instance.options.revert = true;
+
+				//Trigger the stop of the sortable
+				this.instance._mouseStop(event);
+
+				this.instance.options.helper = this.instance.options._helper;
+
+				//If the helper has been the original item, restore properties in the sortable
+				if(inst.options.helper == 'original')
+					this.instance.currentItem.css({ top: 'auto', left: 'auto' });
+
+			} else {
+				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+				this.instance._trigger("deactivate", event, uiSortable);
+			}
+
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), self = this;
+
+		var checkPos = function(o) {
+			var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
+			var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
+			var itemHeight = o.height, itemWidth = o.width;
+			var itemTop = o.top, itemLeft = o.left;
+
+			return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
+		};
+
+		$.each(inst.sortables, function(i) {
+			
+			//Copy over some variables to allow calling the sortable's native _intersectsWith
+			this.instance.positionAbs = inst.positionAbs;
+			this.instance.helperProportions = inst.helperProportions;
+			this.instance.offset.click = inst.offset.click;
+			
+			if(this.instance._intersectsWith(this.instance.containerCache)) {
+
+				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+				if(!this.instance.isOver) {
+
+					this.instance.isOver = 1;
+					//Now we fake the start of dragging for the sortable instance,
+					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+					this.instance.currentItem = $(self).clone().removeAttr('id').appendTo(this.instance.element).data("sortable-item", true);
+					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+					this.instance.options.helper = function() { return ui.helper[0]; };
+
+					event.target = this.instance.currentItem[0];
+					this.instance._mouseCapture(event, true);
+					this.instance._mouseStart(event, true, true);
+
+					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+					this.instance.offset.click.top = inst.offset.click.top;
+					this.instance.offset.click.left = inst.offset.click.left;
+					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+					inst._trigger("toSortable", event);
+					inst.dropped = this.instance.element; //draggable revert needs that
+					//hack so receive/update callbacks work (mostly)
+					inst.currentItem = inst.element;
+					this.instance.fromOutside = inst;
+
+				}
+
+				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+				if(this.instance.currentItem) this.instance._mouseDrag(event);
+
+			} else {
+
+				//If it doesn't intersect with the sortable, and it intersected before,
+				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+				if(this.instance.isOver) {
+
+					this.instance.isOver = 0;
+					this.instance.cancelHelperRemoval = true;
+					
+					//Prevent reverting on this forced stop
+					this.instance.options.revert = false;
+					
+					// The out event needs to be triggered independently
+					this.instance._trigger('out', event, this.instance._uiHash(this.instance));
+					
+					this.instance._mouseStop(event, true);
+					this.instance.options.helper = this.instance.options._helper;
+
+					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+					this.instance.currentItem.remove();
+					if(this.instance.placeholder) this.instance.placeholder.remove();
+
+					inst._trigger("fromSortable", event);
+					inst.dropped = false; //draggable revert needs that
+				}
+
+			};
+
+		});
+
+	}
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+	start: function(event, ui) {
+		var t = $('body'), o = $(this).data('draggable').options;
+		if (t.css("cursor")) o._cursor = t.css("cursor");
+		t.css("cursor", o.cursor);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if (o._cursor) $('body').css("cursor", o._cursor);
+	}
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data('draggable').options;
+		if(t.css("opacity")) o._opacity = t.css("opacity");
+		t.css('opacity', o.opacity);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if(o._opacity) $(ui.helper).css('opacity', o._opacity);
+	}
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+	start: function(event, ui) {
+		var i = $(this).data("draggable");
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
+	},
+	drag: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options, scrolled = false;
+
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
+
+			if(!o.axis || o.axis != 'x') {
+				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+			}
+
+		} else {
+
+			if(!o.axis || o.axis != 'x') {
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+			}
+
+		}
+
+		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(i, event);
+
+	}
+});
+
+$.ui.plugin.add("draggable", "snap", {
+	start: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options;
+		i.snapElements = [];
+
+		$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
+			var $t = $(this); var $o = $t.offset();
+			if(this != i.element[0]) i.snapElements.push({
+				item: this,
+				width: $t.outerWidth(), height: $t.outerHeight(),
+				top: $o.top, left: $o.left
+			});
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options;
+		var d = o.snapTolerance;
+
+		var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+		for (var i = inst.snapElements.length - 1; i >= 0; i--){
+
+			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
+				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
+
+			//Yes, I know, this is insane ;)
+			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
+				if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				inst.snapElements[i].snapping = false;
+				continue;
+			}
+
+			if(o.snapMode != 'inner') {
+				var ts = Math.abs(t - y2) <= d;
+				var bs = Math.abs(b - y1) <= d;
+				var ls = Math.abs(l - x2) <= d;
+				var rs = Math.abs(r - x1) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+			}
+
+			var first = (ts || bs || ls || rs);
+
+			if(o.snapMode != 'outer') {
+				var ts = Math.abs(t - y1) <= d;
+				var bs = Math.abs(b - y2) <= d;
+				var ls = Math.abs(l - x1) <= d;
+				var rs = Math.abs(r - x2) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+			}
+
+			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
+				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+		};
+
+	}
+});
+
+$.ui.plugin.add("draggable", "stack", {
+	start: function(event, ui) {
+
+		var o = $(this).data("draggable").options;
+
+		var group = $.makeArray($(o.stack)).sort(function(a,b) {
+			return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+		});
+		if (!group.length) { return; }
+		
+		var min = parseInt(group[0].style.zIndex) || 0;
+		$(group).each(function(i) {
+			this.style.zIndex = min + i;
+		});
+
+		this[0].style.zIndex = min + group.length;
+
+	}
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("draggable").options;
+		if(t.css("zIndex")) o._zIndex = t.css("zIndex");
+		t.css('zIndex', o.zIndex);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("draggable").options;
+		if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
+	}
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.droppable", {
+	widgetEventPrefix: "drop",
+	options: {
+		accept: '*',
+		activeClass: false,
+		addClasses: true,
+		greedy: false,
+		hoverClass: false,
+		scope: 'default',
+		tolerance: 'intersect'
+	},
+	_create: function() {
+
+		var o = this.options, accept = o.accept;
+		this.isover = 0; this.isout = 1;
+
+		this.accept = $.isFunction(accept) ? accept : function(d) {
+			return d.is(accept);
+		};
+
+		//Store the droppable's proportions
+		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
+		$.ui.ddmanager.droppables[o.scope].push(this);
+
+		(o.addClasses && this.element.addClass("ui-droppable"));
+
+	},
+
+	destroy: function() {
+		var drop = $.ui.ddmanager.droppables[this.options.scope];
+		for ( var i = 0; i < drop.length; i++ )
+			if ( drop[i] == this )
+				drop.splice(i, 1);
+
+		this.element
+			.removeClass("ui-droppable ui-droppable-disabled")
+			.removeData("droppable")
+			.unbind(".droppable");
+
+		return this;
+	},
+
+	_setOption: function(key, value) {
+
+		if(key == 'accept') {
+			this.accept = $.isFunction(value) ? value : function(d) {
+				return d.is(value);
+			};
+		}
+		$.Widget.prototype._setOption.apply(this, arguments);
+	},
+
+	_activate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) this.element.addClass(this.options.activeClass);
+		(draggable && this._trigger('activate', event, this.ui(draggable)));
+	},
+
+	_deactivate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
+		(draggable && this._trigger('deactivate', event, this.ui(draggable)));
+	},
+
+	_over: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) this.element.addClass(this.options.hoverClass);
+			this._trigger('over', event, this.ui(draggable));
+		}
+
+	},
+
+	_out: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
+			this._trigger('out', event, this.ui(draggable));
+		}
+
+	},
+
+	_drop: function(event,custom) {
+
+		var draggable = custom || $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
+
+		var childrenIntersection = false;
+		this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
+			var inst = $.data(this, 'droppable');
+			if(
+				inst.options.greedy
+				&& !inst.options.disabled
+				&& inst.options.scope == draggable.options.scope
+				&& inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element))
+				&& $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
+		});
+		if(childrenIntersection) return false;
+
+		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
+			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
+			this._trigger('drop', event, this.ui(draggable));
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function(c) {
+		return {
+			draggable: (c.currentItem || c.element),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.droppable, {
+	version: "1.8.22"
+});
+
+$.ui.intersect = function(draggable, droppable, toleranceMode) {
+
+	if (!droppable.offset) return false;
+
+	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
+	var l = droppable.offset.left, r = l + droppable.proportions.width,
+		t = droppable.offset.top, b = t + droppable.proportions.height;
+
+	switch (toleranceMode) {
+		case 'fit':
+			return (l <= x1 && x2 <= r
+				&& t <= y1 && y2 <= b);
+			break;
+		case 'intersect':
+			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
+				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
+				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
+			break;
+		case 'pointer':
+			var draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left),
+				draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top),
+				isOver = $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width);
+			return isOver;
+			break;
+		case 'touch':
+			return (
+					(y1 >= t && y1 <= b) ||	// Top edge touching
+					(y2 >= t && y2 <= b) ||	// Bottom edge touching
+					(y1 < t && y2 > b)		// Surrounded vertically
+				) && (
+					(x1 >= l && x1 <= r) ||	// Left edge touching
+					(x2 >= l && x2 <= r) ||	// Right edge touching
+					(x1 < l && x2 > r)		// Surrounded horizontally
+				);
+			break;
+		default:
+			return false;
+			break;
+		}
+
+};
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { 'default': [] },
+	prepareOffsets: function(t, event) {
+
+		var m = $.ui.ddmanager.droppables[t.options.scope] || [];
+		var type = event ? event.type : null; // workaround for #2317
+		var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
+
+		droppablesLoop: for (var i = 0; i < m.length; i++) {
+
+			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) continue;	//No disabled and non-accepted
+			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
+			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
+
+			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
+			m[i].offset = m[i].element.offset();
+			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+
+		}
+
+	},
+	drop: function(draggable, event) {
+
+		var dropped = false;
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(!this.options) return;
+			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
+				dropped = this._drop.call(this, event) || dropped;
+
+			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+				this.isout = 1; this.isover = 0;
+				this._deactivate.call(this, event);
+			}
+
+		});
+		return dropped;
+
+	},
+	dragStart: function( draggable, event ) {
+		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+		draggable.element.parents( ":not(body,html)" ).bind( "scroll.droppable", function() {
+			if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
+		});
+	},
+	drag: function(draggable, event) {
+
+		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
+		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, event);
+
+		//Run through all droppables and check their positions based on specific tolerance options
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(this.options.disabled || this.greedyChild || !this.visible) return;
+			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
+
+			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
+			if(!c) return;
+
+			var parentInstance;
+			if (this.options.greedy) {
+				var parent = this.element.parents(':data(droppable):eq(0)');
+				if (parent.length) {
+					parentInstance = $.data(parent[0], 'droppable');
+					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
+				}
+			}
+
+			// we just moved into a greedy child
+			if (parentInstance && c == 'isover') {
+				parentInstance['isover'] = 0;
+				parentInstance['isout'] = 1;
+				parentInstance._out.call(parentInstance, event);
+			}
+
+			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
+			this[c == "isover" ? "_over" : "_out"].call(this, event);
+
+			// we just moved out of a greedy child
+			if (parentInstance && c == 'isout') {
+				parentInstance['isout'] = 0;
+				parentInstance['isover'] = 1;
+				parentInstance._over.call(parentInstance, event);
+			}
+		});
+
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parents( ":not(body,html)" ).unbind( "scroll.droppable" );
+		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+		if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
+	}
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.resizable", $.ui.mouse, {
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var self = this, o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({
+					position: this.element.css('position'),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css('top'),
+					left: this.element.css('left')
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"resizable", this.element.data('resizable')
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css('resize');
+			this.originalElement.css('resize', 'none');
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css('margin') });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
+		if(this.handles.constructor == String) {
+
+			if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
+			var n = this.handles.split(","); this.handles = {};
+
+			for(var i = 0; i < n.length; i++) {
+
+				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
+				var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
+
+				// Apply zIndex to all handles - see #7960
+				axis.css({ zIndex: o.zIndex });
+
+				//TODO : What's going on here?
+				if ('se' == handle) {
+					axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
+				};
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = '.ui-resizable-'+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			target = target || this.element;
+
+			for(var i in this.handles) {
+
+				if(this.handles[i].constructor == String)
+					this.handles[i] = $(this.handles[i], this.element).show();
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					var axis = $(this.handles[i], this.element), padWrapper = 0;
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					var padPos = [ 'padding',
+						/ne|nw|n/.test(i) ? 'Top' :
+						/se|sw|s/.test(i) ? 'Bottom' :
+						/^e$/.test(i) ? 'Right' : 'Left' ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length)
+					continue;
+
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $('.ui-resizable-handle', this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!self.resizing) {
+				if (this.className)
+					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				//Axis, default = se
+				self.axis = axis && axis[1] ? axis[1] : 'se';
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.hover(function() {
+					if (o.disabled) return;
+					$(this).removeClass("ui-resizable-autohide");
+					self._handles.show();
+				},
+				function(){
+					if (o.disabled) return;
+					if (!self.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						self._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+
+		this._mouseDestroy();
+
+		var _destroy = function(exp) {
+			$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+				.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
+		};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			var wrapper = this.element;
+			wrapper.after(
+				this.originalElement.css({
+					position: wrapper.css('position'),
+					width: wrapper.outerWidth(),
+					height: wrapper.outerHeight(),
+					top: wrapper.css('top'),
+					left: wrapper.css('left')
+				})
+			).remove();
+		}
+
+		this.originalElement.css('resize', this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var handle = false;
+		for (var i in this.handles) {
+			if ($(this.handles[i])[0] == event.target) {
+				handle = true;
+			}
+		}
+
+		return !this.options.disabled && handle;
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options, iniPos = this.element.position(), el = this.element;
+
+		this.resizing = true;
+		this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
+			el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
+		}
+
+		this._renderProxy();
+
+		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+	    var cursor = $('.ui-resizable-' + this.axis).css('cursor');
+	    $('body').css('cursor', cursor == 'auto' ? this.axis + '-resize' : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var el = this.helper, o = this.options, props = {},
+			self = this, smp = this.originalMousePosition, a = this.axis;
+
+		var dx = (event.pageX-smp.left)||0, dy = (event.pageY-smp.top)||0;
+		var trigger = this._change[a];
+		if (!trigger) return false;
+
+		// Calculate the attrs that will be change
+		var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
+
+		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
+		this._updateVirtualBoundaries(event.shiftKey);
+		if (this._aspectRatio || event.shiftKey)
+			data = this._updateRatio(data, event);
+
+		data = this._respectSize(data, event);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		el.css({
+			top: this.position.top + "px", left: this.position.left + "px",
+			width: this.size.width + "px", height: this.size.height + "px"
+		});
+
+		if (!this._helper && this._proportionallyResizeElements.length)
+			this._proportionallyResize();
+
+		this._updateCache(data);
+
+		// calling the user callback at the end
+		this._trigger('resize', event, this.ui());
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var o = this.options, self = this;
+
+		if(this._helper) {
+			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+				soffsetw = ista ? 0 : self.sizeDiff.width;
+
+			var s = { width: (self.helper.width()  - soffsetw), height: (self.helper.height() - soffseth) },
+				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+			if (!o.animate)
+				this.element.css($.extend(s, { top: top, left: left }));
+
+			self.helper.height(self.size.height);
+			self.helper.width(self.size.width);
+
+			if (this._helper && !o.animate) this._proportionallyResize();
+		}
+
+		$('body').css('cursor', 'auto');
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) this.helper.remove();
+		return false;
+
+	},
+
+    _updateVirtualBoundaries: function(forceAspectRatio) {
+        var o = this.options, pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b;
+
+        b = {
+            minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+            maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+            minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+            maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+        };
+
+        if(this._aspectRatio || forceAspectRatio) {
+            // We want to create an enclosing box whose aspect ration is the requested one
+            // First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+            pMinWidth = b.minHeight * this.aspectRatio;
+            pMinHeight = b.minWidth / this.aspectRatio;
+            pMaxWidth = b.maxHeight * this.aspectRatio;
+            pMaxHeight = b.maxWidth / this.aspectRatio;
+
+            if(pMinWidth > b.minWidth) b.minWidth = pMinWidth;
+            if(pMinHeight > b.minHeight) b.minHeight = pMinHeight;
+            if(pMaxWidth < b.maxWidth) b.maxWidth = pMaxWidth;
+            if(pMaxHeight < b.maxHeight) b.maxHeight = pMaxHeight;
+        }
+        this._vBoundaries = b;
+    },
+
+	_updateCache: function(data) {
+		var o = this.options;
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) this.position.left = data.left;
+		if (isNumber(data.top)) this.position.top = data.top;
+		if (isNumber(data.height)) this.size.height = data.height;
+		if (isNumber(data.width)) this.size.width = data.width;
+	},
+
+	_updateRatio: function(data, event) {
+
+		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
+
+		if (isNumber(data.height)) data.width = (data.height * this.aspectRatio);
+		else if (isNumber(data.width)) data.height = (data.width / this.aspectRatio);
+
+		if (a == 'sw') {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a == 'nw') {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function(data, event) {
+
+		var el = this.helper, o = this._vBoundaries, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
+
+		if (isminw) data.width = o.minWidth;
+		if (isminh) data.height = o.minHeight;
+		if (ismaxw) data.width = o.maxWidth;
+		if (ismaxh) data.height = o.maxHeight;
+
+		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
+		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+
+		if (isminw && cw) data.left = dw - o.minWidth;
+		if (ismaxw && cw) data.left = dw - o.maxWidth;
+		if (isminh && ch)	data.top = dh - o.minHeight;
+		if (ismaxh && ch)	data.top = dh - o.maxHeight;
+
+		// fixing jump error on top/left - bug #2330
+		var isNotwh = !data.width && !data.height;
+		if (isNotwh && !data.left && data.top) data.top = null;
+		else if (isNotwh && !data.top && data.left) data.left = null;
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		var o = this.options;
+		if (!this._proportionallyResizeElements.length) return;
+		var element = this.helper || this.element;
+
+		for (var i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			var prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
+					p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
+
+				this.borderDif = $.map(b, function(v, i) {
+					var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
+					return border + padding;
+				});
+			}
+
+			if ($.browser.msie && !(!($(element).is(':hidden') || $(element).parents(':hidden').length)))
+				continue;
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		};
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
+
+			// fix ie6 offset TODO: This seems broken
+			var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
+			pxyoffset = ( ie6 ? 2 : -1 );
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() + pxyoffset,
+				height: this.element.outerHeight() + pxyoffset,
+				position: 'absolute',
+				left: this.elementOffset.left - ie6offset +'px',
+				top: this.elementOffset.top - ie6offset +'px',
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx, dy) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n != "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+$.extend($.ui.resizable, {
+	version: "1.8.22"
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _store = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				el.data("resizable-alsoresize", {
+					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10)
+				});
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;
+
+		var delta = {
+			height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
+			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
+		},
+
+		_alsoResize = function (exp, c) {
+			$(exp).each(function() {
+				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, 
+					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
+
+				$.each(css, function (i, prop) {
+					var sum = (start[prop]||0) + (delta[prop]||0);
+					if (sum && sum >= 0)
+						style[prop] = sum || null;
+				});
+
+				el.css(style);
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function (event, ui) {
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var pr = self._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+					soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+						soffsetw = ista ? 0 : self.sizeDiff.width;
+
+		var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+					left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+						top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+		self.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(self.element.css('width'), 10),
+						height: parseInt(self.element.css('height'), 10),
+						top: parseInt(self.element.css('top'), 10),
+						left: parseInt(self.element.css('left'), 10)
+					};
+
+					if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.height });
+
+					// propagating resize, and updating values for each animation step
+					self._updateCache(data);
+					self._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, el = self.element;
+		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+		if (!ce) return;
+
+		self.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc == document) {
+			self.containerOffset = { left: 0, top: 0 };
+			self.containerPosition = { left: 0, top: 0 };
+
+			self.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			var element = $(ce), p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			self.containerOffset = element.offset();
+			self.containerPosition = element.position();
+			self.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			var co = self.containerOffset, ch = self.containerSize.height,	cw = self.containerSize.width,
+						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			self.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options,
+				ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
+				pRatio = self._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
+
+		if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
+
+		if (cp.left < (self._helper ? co.left : 0)) {
+			self.size.width = self.size.width + (self._helper ? (self.position.left - co.left) : (self.position.left - cop.left));
+			if (pRatio) self.size.height = self.size.width / self.aspectRatio;
+			self.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (self._helper ? co.top : 0)) {
+			self.size.height = self.size.height + (self._helper ? (self.position.top - co.top) : self.position.top);
+			if (pRatio) self.size.width = self.size.height * self.aspectRatio;
+			self.position.top = self._helper ? co.top : 0;
+		}
+
+		self.offset.left = self.parentData.left+self.position.left;
+		self.offset.top = self.parentData.top+self.position.top;
+
+		var woset = Math.abs( (self._helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
+					hoset = Math.abs( (self._helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
+
+		var isParent = self.containerElement.get(0) == self.element.parent().get(0),
+		    isOffsetRelative = /relative|absolute/.test(self.containerElement.css('position'));
+
+		if(isParent && isOffsetRelative) woset -= self.parentData.left;
+
+		if (woset + self.size.width >= self.parentData.width) {
+			self.size.width = self.parentData.width - woset;
+			if (pRatio) self.size.height = self.size.width / self.aspectRatio;
+		}
+
+		if (hoset + self.size.height >= self.parentData.height) {
+			self.size.height = self.parentData.height - hoset;
+			if (pRatio) self.size.width = self.size.height * self.aspectRatio;
+		}
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options, cp = self.position,
+				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
+
+		var helper = $(self.helper), ho = helper.offset(), w = helper.outerWidth() - self.sizeDiff.width, h = helper.outerHeight() - self.sizeDiff.height;
+
+		if (self._helper && !o.animate && (/relative/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+		if (self._helper && !o.animate && (/static/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function(event, ui) {
+
+		var self = $(this).data("resizable"), o = self.options, cs = self.size;
+
+		self.ghost = self.originalElement.clone();
+		self.ghost
+			.css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass('ui-resizable-ghost')
+			.addClass(typeof o.ghost == 'string' ? o.ghost : '');
+
+		self.ghost.appendTo(self.helper);
+
+	},
+
+	resize: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || event.shiftKey;
+		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
+		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
+
+		if (/^(se|s|e)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+		}
+		else if (/^(ne)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+		}
+		else if (/^(sw)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.left = op.left - ox;
+		}
+		else {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+			self.position.left = op.left - ox;
+		}
+	}
+
+});
+
+var num = function(v) {
+	return parseInt(v, 10) || 0;
+};
+
+var isNumber = function(value) {
+	return !isNaN(parseInt(value, 10));
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.selectable", $.ui.mouse, {
+	options: {
+		appendTo: 'body',
+		autoRefresh: true,
+		distance: 0,
+		filter: '*',
+		tolerance: 'touch'
+	},
+	_create: function() {
+		var self = this;
+
+		this.element.addClass("ui-selectable");
+
+		this.dragged = false;
+
+		// cache selectee children based on filter
+		var selectees;
+		this.refresh = function() {
+			selectees = $(self.options.filter, self.element[0]);
+			selectees.addClass("ui-selectee");
+			selectees.each(function() {
+				var $this = $(this);
+				var pos = $this.offset();
+				$.data(this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass('ui-selected'),
+					selecting: $this.hasClass('ui-selecting'),
+					unselecting: $this.hasClass('ui-unselecting')
+				});
+			});
+		};
+		this.refresh();
+
+		this.selectees = selectees.addClass("ui-selectee");
+
+		this._mouseInit();
+
+		this.helper = $("<div class='ui-selectable-helper'></div>");
+	},
+
+	destroy: function() {
+		this.selectees
+			.removeClass("ui-selectee")
+			.removeData("selectable-item");
+		this.element
+			.removeClass("ui-selectable ui-selectable-disabled")
+			.removeData("selectable")
+			.unbind(".selectable");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseStart: function(event) {
+		var self = this;
+
+		this.opos = [event.pageX, event.pageY];
+
+		if (this.options.disabled)
+			return;
+
+		var options = this.options;
+
+		this.selectees = $(options.filter, this.element[0]);
+
+		this._trigger("start", event);
+
+		$(options.appendTo).append(this.helper);
+		// position helper (lasso)
+		this.helper.css({
+			"left": event.clientX,
+			"top": event.clientY,
+			"width": 0,
+			"height": 0
+		});
+
+		if (options.autoRefresh) {
+			this.refresh();
+		}
+
+		this.selectees.filter('.ui-selected').each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.startselected = true;
+			if (!event.metaKey && !event.ctrlKey) {
+				selectee.$element.removeClass('ui-selected');
+				selectee.selected = false;
+				selectee.$element.addClass('ui-unselecting');
+				selectee.unselecting = true;
+				// selectable UNSELECTING callback
+				self._trigger("unselecting", event, {
+					unselecting: selectee.element
+				});
+			}
+		});
+
+		$(event.target).parents().andSelf().each(function() {
+			var selectee = $.data(this, "selectable-item");
+			if (selectee) {
+				var doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected');
+				selectee.$element
+					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+				// selectable (UN)SELECTING callback
+				if (doSelect) {
+					self._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				} else {
+					self._trigger("unselecting", event, {
+						unselecting: selectee.element
+					});
+				}
+				return false;
+			}
+		});
+
+	},
+
+	_mouseDrag: function(event) {
+		var self = this;
+		this.dragged = true;
+
+		if (this.options.disabled)
+			return;
+
+		var options = this.options;
+
+		var x1 = this.opos[0], y1 = this.opos[1], x2 = event.pageX, y2 = event.pageY;
+		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
+		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
+
+		this.selectees.each(function() {
+			var selectee = $.data(this, "selectable-item");
+			//prevent helper from being selected if appendTo: selectable
+			if (!selectee || selectee.element == self.element[0])
+				return;
+			var hit = false;
+			if (options.tolerance == 'touch') {
+				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
+			} else if (options.tolerance == 'fit') {
+				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			}
+
+			if (hit) {
+				// SELECT
+				if (selectee.selected) {
+					selectee.$element.removeClass('ui-selected');
+					selectee.selected = false;
+				}
+				if (selectee.unselecting) {
+					selectee.$element.removeClass('ui-unselecting');
+					selectee.unselecting = false;
+				}
+				if (!selectee.selecting) {
+					selectee.$element.addClass('ui-selecting');
+					selectee.selecting = true;
+					// selectable SELECTING callback
+					self._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				}
+			} else {
+				// UNSELECT
+				if (selectee.selecting) {
+					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
+						selectee.$element.removeClass('ui-selecting');
+						selectee.selecting = false;
+						selectee.$element.addClass('ui-selected');
+						selectee.selected = true;
+					} else {
+						selectee.$element.removeClass('ui-selecting');
+						selectee.selecting = false;
+						if (selectee.startselected) {
+							selectee.$element.addClass('ui-unselecting');
+							selectee.unselecting = true;
+						}
+						// selectable UNSELECTING callback
+						self._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+				if (selectee.selected) {
+					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
+						selectee.$element.removeClass('ui-selected');
+						selectee.selected = false;
+
+						selectee.$element.addClass('ui-unselecting');
+						selectee.unselecting = true;
+						// selectable UNSELECTING callback
+						self._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+			}
+		});
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+		var self = this;
+
+		this.dragged = false;
+
+		var options = this.options;
+
+		$('.ui-unselecting', this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass('ui-unselecting');
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			self._trigger("unselected", event, {
+				unselected: selectee.element
+			});
+		});
+		$('.ui-selecting', this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			self._trigger("selected", event, {
+				selected: selectee.element
+			});
+		});
+		this._trigger("stop", event);
+
+		this.helper.remove();
+
+		return false;
+	}
+
+});
+
+$.extend($.ui.selectable, {
+	version: "1.8.22"
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.sortable", $.ui.mouse, {
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: 'auto',
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: '> *',
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+		
+		//We're ready to go
+		this.ready = true
+
+	},
+
+	destroy: function() {
+		$.Widget.prototype.destroy.call( this );
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- )
+			this.items[i].item.removeData(this.widgetName + "-item");
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+	
+			this.widget()
+				[ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+		var that = this;
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type == 'static') return false;
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		var currentItem = null, self = this, nodes = $(event.target).parents().each(function() {
+			if($.data(this, that.widgetName + '-item') == self) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, that.widgetName + '-item') == self) currentItem = $(event.target);
+
+		if(!currentItem) return false;
+		if(this.options.handle && !overrideHandle) {
+			var validHandle = false;
+
+			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
+			if(!validHandle) return false;
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var o = this.options, self = this;
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+		
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] != this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		if(o.cursor) { // cursor option
+			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
+			$('body').css("cursor", o.cursor);
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
+			this.overflowOffset = this.scrollParent.offset();
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions)
+			this._cacheHelperProportions();
+
+
+		//Post 'activate' events to possible containers
+		if(!noActivation) {
+			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, self._uiHash(this)); }
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			var o = this.options, scrolled = false;
+			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+				$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+
+		//Rearrange
+		for (var i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+			if (!intersection) continue;
+
+			if(itemElement != this.currentItem[0] //cannot intersect with itself
+				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+				&&	!$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+				&& (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
+				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+			) {
+
+				this.direction = intersection == 1 ? "down" : "up";
+
+				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		//Call callbacks
+		this._trigger('sort', event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) return;
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			$.ui.ddmanager.drop(this, event);
+
+		if(this.options.revert) {
+			var self = this;
+			var cur = self.placeholder.offset();
+
+			self.reverting = true;
+
+			$(this.helper).animate({
+				left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
+				top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
+			}, parseInt(this.options.revert, 10) || 500, function() {
+				self._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		var self = this;
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper == "original")
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			else
+				this.currentItem.show();
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, self._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, self._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var str = []; o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + '=');
+		}
+
+		return str.join('&');
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var ret = []; o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height;
+
+		var l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height;
+
+		var dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left;
+
+		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
+
+		if(	   this.options.tolerance == "pointer"
+			|| this.options.forcePointerForContainers
+			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) // Right Half
+				&& x2 - (this.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
+				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = (this.options.axis === 'x') || $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = (this.options.axis === 'y') || $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement)
+			return false;
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta != 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta != 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor == String
+			? [options.connectWith]
+			: options.connectWith;
+	},
+	
+	_getItemsAsjQuery: function(connected) {
+
+		var self = this;
+		var items = [];
+		var queries = [];
+		var connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], this.widgetName);
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+					}
+				};
+			};
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
+
+		for (var i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		};
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+
+		for (var i=0; i < this.items.length; i++) {
+
+			for (var j=0; j < list.length; j++) {
+				if(list[j] == this.items[i].item[0])
+					this.items.splice(i,1);
+			};
+
+		};
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+		var items = this.items;
+		var self = this;
+		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
+		var connectWith = this._connectWith();
+
+		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], this.widgetName);
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				};
+			};
+		}
+
+		for (var i = queries.length - 1; i >= 0; i--) {
+			var targetData = queries[i][1];
+			var _queries = queries[i][0];
+
+			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				var item = $(_queries[j]);
+
+				item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			};
+		};
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		for (var i = this.items.length - 1; i >= 0; i--){
+			var item = this.items[i];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
+				continue;
+
+			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			var p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		};
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				var p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left = p.left;
+				this.containers[i].containerCache.top = p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			};
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+
+		var self = that || this, o = self.options;
+
+		if(!o.placeholder || o.placeholder.constructor == String) {
+			var className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var el = $(document.createElement(self.currentItem[0].nodeName))
+						.addClass(className || self.currentItem[0].className+" ui-sortable-placeholder")
+						.removeClass("ui-sortable-helper")[0];
+
+					if(!className)
+						el.style.visibility = "hidden";
+
+					return el;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) return;
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop')||0, 10) - parseInt(self.currentItem.css('paddingBottom')||0, 10)); };
+					if(!p.width()) { p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft')||0, 10) - parseInt(self.currentItem.css('paddingRight')||0, 10)); };
+				}
+			};
+		}
+
+		//Create the placeholder
+		self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem));
+
+		//Append it after the actual current item
+		self.currentItem.after(self.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(self, self.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+		
+		// get innermost container that intersects with item 
+		var innermostContainer = null, innermostIndex = null;		
+		
+		
+		for (var i = this.containers.length - 1; i >= 0; i--){
+
+			// never consider a container that's located within the item itself 
+			if($.ui.contains(this.currentItem[0], this.containers[i].element[0]))
+				continue;
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue 
+				if(innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0]))
+					continue;
+
+				innermostContainer = this.containers[i]; 
+				innermostIndex = i;
+					
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary 
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+		
+		// if no intersecting containers found, return 
+		if(!innermostContainer) return; 
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		} else if(this.currentContainer != this.containers[innermostIndex]) {
+
+			//When entering a new container, we will find the item with the least distance and append our item near it
+			var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[innermostIndex].floating ? 'left' : 'top'];
+			for (var j = this.items.length - 1; j >= 0; j--) {
+				if(!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
+				var cur = this.containers[innermostIndex].floating ? this.items[j].item.offset().left : this.items[j].item.offset().top;
+				if(Math.abs(cur - base) < dist) {
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+					this.direction = (cur - base > 0) ? 'down' : 'up';
+				}
+			}
+
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
+				return;
+
+			this.currentContainer = this.containers[innermostIndex];
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
+			this._trigger("change", event, this._uiHash());
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+
+			//Update the placeholder
+			this.options.placeholder.update(this.currentContainer, this.placeholder);
+
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		} 
+	
+		
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
+
+		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
+			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+
+		if(helper[0] == this.currentItem[0])
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+
+		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
+		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			0 - this.offset.relative.left - this.offset.parent.left,
+			0 - this.offset.relative.top - this.offset.parent.top,
+			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			var ce = $(o.containment)[0];
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var self = this, counter = this.counter;
+
+		window.setTimeout(function() {
+			if(counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+		},0);
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var delayedTriggers = [], self = this;
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
+		this._noFinalSort = null;
+
+		if(this.helper[0] == this.currentItem[0]) {
+			for(var i in this._storedCSS) {
+				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
+			if(!noPropagation) delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				if($.ui.contains(this.containers[i].element[0], this.currentItem[0]) && !noPropagation) {
+					delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+					delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.containers[i]));
+				}
+			};
+		};
+
+		//Post events to containers
+		for (var i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
+		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
+		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+
+			this.fromOutside = false;
+			return false;
+		}
+
+		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
+
+		if(!noPropagation) {
+			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(inst) {
+		var self = inst || this;
+		return {
+			helper: self.helper,
+			placeholder: self.placeholder || $([]),
+			position: self.position,
+			originalPosition: self.originalPosition,
+			offset: self.positionAbs,
+			item: self.currentItem,
+			sender: inst ? inst.element : null
+		};
+	}
+
+});
+
+$.extend($.ui.sortable, {
+	version: "1.8.22"
+});
+
+})(jQuery);
+
+;jQuery.effects || (function($, undefined) {
+
+$.effects = {};
+
+
+
+/******************************************************************************/
+/****************************** COLOR ANIMATIONS ******************************/
+/******************************************************************************/
+
+// override the animation for color styles
+$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor',
+	'borderRightColor', 'borderTopColor', 'borderColor', 'color', 'outlineColor'],
+function(i, attr) {
+	$.fx.step[attr] = function(fx) {
+		if (!fx.colorInit) {
+			fx.start = getColor(fx.elem, attr);
+			fx.end = getRGB(fx.end);
+			fx.colorInit = true;
+		}
+
+		fx.elem.style[attr] = 'rgb(' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0) + ',' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0) + ',' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0) + ')';
+	};
+});
+
+// Color Conversion functions from highlightFade
+// By Blair Mitchelmore
+// http://jquery.offput.ca/highlightFade/
+
+// Parse strings looking for color tuples [255,255,255]
+function getRGB(color) {
+		var result;
+
+		// Check if we're already dealing with an array of colors
+		if ( color && color.constructor == Array && color.length == 3 )
+				return color;
+
+		// Look for rgb(num,num,num)
+		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
+				return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
+
+		// Look for rgb(num%,num%,num%)
+		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
+				return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
+
+		// Look for #a0b1c2
+		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
+				return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+
+		// Look for #fff
+		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
+				return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
+
+		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
+		if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
+				return colors['transparent'];
+
+		// Otherwise, we're most likely dealing with a named color
+		return colors[$.trim(color).toLowerCase()];
+}
+
+function getColor(elem, attr) {
+		var color;
+
+		do {
+				// jQuery <1.4.3 uses curCSS, in 1.4.3 - 1.7.2 curCSS = css, 1.8+ only has css
+				color = ($.curCSS || $.css)(elem, attr);
+
+				// Keep going until we find an element that has color, or we hit the body
+				if ( color != '' && color != 'transparent' || $.nodeName(elem, "body") )
+						break;
+
+				attr = "backgroundColor";
+		} while ( elem = elem.parentNode );
+
+		return getRGB(color);
+};
+
+// Some named colors to work with
+// From Interface by Stefan Petre
+// http://interface.eyecon.ro/
+
+var colors = {
+	aqua:[0,255,255],
+	azure:[240,255,255],
+	beige:[245,245,220],
+	black:[0,0,0],
+	blue:[0,0,255],
+	brown:[165,42,42],
+	cyan:[0,255,255],
+	darkblue:[0,0,139],
+	darkcyan:[0,139,139],
+	darkgrey:[169,169,169],
+	darkgreen:[0,100,0],
+	darkkhaki:[189,183,107],
+	darkmagenta:[139,0,139],
+	darkolivegreen:[85,107,47],
+	darkorange:[255,140,0],
+	darkorchid:[153,50,204],
+	darkred:[139,0,0],
+	darksalmon:[233,150,122],
+	darkviolet:[148,0,211],
+	fuchsia:[255,0,255],
+	gold:[255,215,0],
+	green:[0,128,0],
+	indigo:[75,0,130],
+	khaki:[240,230,140],
+	lightblue:[173,216,230],
+	lightcyan:[224,255,255],
+	lightgreen:[144,238,144],
+	lightgrey:[211,211,211],
+	lightpink:[255,182,193],
+	lightyellow:[255,255,224],
+	lime:[0,255,0],
+	magenta:[255,0,255],
+	maroon:[128,0,0],
+	navy:[0,0,128],
+	olive:[128,128,0],
+	orange:[255,165,0],
+	pink:[255,192,203],
+	purple:[128,0,128],
+	violet:[128,0,128],
+	red:[255,0,0],
+	silver:[192,192,192],
+	white:[255,255,255],
+	yellow:[255,255,0],
+	transparent: [255,255,255]
+};
+
+
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+
+var classAnimationActions = ['add', 'remove', 'toggle'],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+function getElementStyles() {
+	var style = document.defaultView
+			? document.defaultView.getComputedStyle(this, null)
+			: this.currentStyle,
+		newStyle = {},
+		key,
+		camelCase;
+
+	// webkit enumerates style porperties
+	if (style && style.length && style[0] && style[style[0]]) {
+		var len = style.length;
+		while (len--) {
+			key = style[len];
+			if (typeof style[key] == 'string') {
+				camelCase = key.replace(/\-(\w)/g, function(all, letter){
+					return letter.toUpperCase();
+				});
+				newStyle[camelCase] = style[key];
+			}
+		}
+	} else {
+		for (key in style) {
+			if (typeof style[key] === 'string') {
+				newStyle[key] = style[key];
+			}
+		}
+	}
+	
+	return newStyle;
+}
+
+function filterStyles(styles) {
+	var name, value;
+	for (name in styles) {
+		value = styles[name];
+		if (
+			// ignore null and undefined values
+			value == null ||
+			// ignore functions (when does this occur?)
+			$.isFunction(value) ||
+			// shorthand styles that need to be expanded
+			name in shorthandStyles ||
+			// ignore scrollbars (break in IE)
+			(/scrollbar/).test(name) ||
+
+			// only colors or values that can be converted to numbers
+			(!(/color/i).test(name) && isNaN(parseFloat(value)))
+		) {
+			delete styles[name];
+		}
+	}
+	
+	return styles;
+}
+
+function styleDifference(oldStyle, newStyle) {
+	var diff = { _: 0 }, // http://dev.jquery.com/ticket/5459
+		name;
+
+	for (name in newStyle) {
+		if (oldStyle[name] != newStyle[name]) {
+			diff[name] = newStyle[name];
+		}
+	}
+
+	return diff;
+}
+
+$.effects.animateClass = function(value, duration, easing, callback) {
+	if ($.isFunction(easing)) {
+		callback = easing;
+		easing = null;
+	}
+
+	return this.queue(function() {
+		var that = $(this),
+			originalStyleAttr = that.attr('style') || ' ',
+			originalStyle = filterStyles(getElementStyles.call(this)),
+			newStyle,
+			className = that.attr('class') || "";
+
+		$.each(classAnimationActions, function(i, action) {
+			if (value[action]) {
+				that[action + 'Class'](value[action]);
+			}
+		});
+		newStyle = filterStyles(getElementStyles.call(this));
+		that.attr('class', className);
+
+		that.animate(styleDifference(originalStyle, newStyle), {
+			queue: false,
+			duration: duration,
+			easing: easing,
+			complete: function() {
+				$.each(classAnimationActions, function(i, action) {
+					if (value[action]) { that[action + 'Class'](value[action]); }
+				});
+				// work around bug in IE by clearing the cssText before setting it
+				if (typeof that.attr('style') == 'object') {
+					that.attr('style').cssText = '';
+					that.attr('style').cssText = originalStyleAttr;
+				} else {
+					that.attr('style', originalStyleAttr);
+				}
+				if (callback) { callback.apply(this, arguments); }
+				$.dequeue( this );
+			}
+		});
+	});
+};
+
+$.fn.extend({
+	_addClass: $.fn.addClass,
+	addClass: function(classNames, speed, easing, callback) {
+		return speed ? $.effects.animateClass.apply(this, [{ add: classNames },speed,easing,callback]) : this._addClass(classNames);
+	},
+
+	_removeClass: $.fn.removeClass,
+	removeClass: function(classNames,speed,easing,callback) {
+		return speed ? $.effects.animateClass.apply(this, [{ remove: classNames },speed,easing,callback]) : this._removeClass(classNames);
+	},
+
+	_toggleClass: $.fn.toggleClass,
+	toggleClass: function(classNames, force, speed, easing, callback) {
+		if ( typeof force == "boolean" || force === undefined ) {
+			if ( !speed ) {
+				// without speed parameter;
+				return this._toggleClass(classNames, force);
+			} else {
+				return $.effects.animateClass.apply(this, [(force?{add:classNames}:{remove:classNames}),speed,easing,callback]);
+			}
+		} else {
+			// without switch parameter;
+			return $.effects.animateClass.apply(this, [{ toggle: classNames },force,speed,easing]);
+		}
+	},
+
+	switchClass: function(remove,add,speed,easing,callback) {
+		return $.effects.animateClass.apply(this, [{ add: add, remove: remove },speed,easing,callback]);
+	}
+});
+
+
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+$.extend($.effects, {
+	version: "1.8.22",
+
+	// Saves a set of properties in a data storage
+	save: function(element, set) {
+		for(var i=0; i < set.length; i++) {
+			if(set[i] !== null) element.data("ec.storage."+set[i], element[0].style[set[i]]);
+		}
+	},
+
+	// Restores a set of previously saved properties from a data storage
+	restore: function(element, set) {
+		for(var i=0; i < set.length; i++) {
+			if(set[i] !== null) element.css(set[i], element.data("ec.storage."+set[i]));
+		}
+	},
+
+	setMode: function(el, mode) {
+		if (mode == 'toggle') mode = el.is(':hidden') ? 'show' : 'hide'; // Set for toggle
+		return mode;
+	},
+
+	getBaseline: function(origin, original) { // Translates a [top,left] array into a baseline value
+		// this should be a little more flexible in the future to handle a string & hash
+		var y, x;
+		switch (origin[0]) {
+			case 'top': y = 0; break;
+			case 'middle': y = 0.5; break;
+			case 'bottom': y = 1; break;
+			default: y = origin[0] / original.height;
+		};
+		switch (origin[1]) {
+			case 'left': x = 0; break;
+			case 'center': x = 0.5; break;
+			case 'right': x = 1; break;
+			default: x = origin[1] / original.width;
+		};
+		return {x: x, y: y};
+	},
+
+	// Wraps the element around a wrapper that copies position properties
+	createWrapper: function(element) {
+
+		// if the element is already wrapped, return it
+		if (element.parent().is('.ui-effects-wrapper')) {
+			return element.parent();
+		}
+
+		// wrap the element
+		var props = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				'float': element.css('float')
+			},
+			wrapper = $('<div></div>')
+				.addClass('ui-effects-wrapper')
+				.css({
+					fontSize: '100%',
+					background: 'transparent',
+					border: 'none',
+					margin: 0,
+					padding: 0
+				}),
+			active = document.activeElement;
+
+		// support: Firefox
+		// Firefox incorrectly exposes anonymous content
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
+		try {
+			active.id;
+		} catch( e ) {
+			active = document.body;
+		}
+
+		element.wrap( wrapper );
+
+		// Fixes #7595 - Elements lose focus when wrapped.
+		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+			$( active ).focus();
+		}
+		
+		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
+
+		// transfer positioning properties to the wrapper
+		if (element.css('position') == 'static') {
+			wrapper.css({ position: 'relative' });
+			element.css({ position: 'relative' });
+		} else {
+			$.extend(props, {
+				position: element.css('position'),
+				zIndex: element.css('z-index')
+			});
+			$.each(['top', 'left', 'bottom', 'right'], function(i, pos) {
+				props[pos] = element.css(pos);
+				if (isNaN(parseInt(props[pos], 10))) {
+					props[pos] = 'auto';
+				}
+			});
+			element.css({position: 'relative', top: 0, left: 0, right: 'auto', bottom: 'auto' });
+		}
+
+		return wrapper.css(props).show();
+	},
+
+	removeWrapper: function(element) {
+		var parent,
+			active = document.activeElement;
+		
+		if (element.parent().is('.ui-effects-wrapper')) {
+			parent = element.parent().replaceWith(element);
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).focus();
+			}
+			return parent;
+		}
+			
+		return element;
+	},
+
+	setTransition: function(element, list, factor, value) {
+		value = value || {};
+		$.each(list, function(i, x){
+			var unit = element.cssUnit(x);
+			if (unit[0] > 0) value[x] = unit[0] * factor + unit[1];
+		});
+		return value;
+	}
+});
+
+
+function _normalizeArguments(effect, options, speed, callback) {
+	// shift params for method overloading
+	if (typeof effect == 'object') {
+		callback = options;
+		speed = null;
+		options = effect;
+		effect = options.effect;
+	}
+	if ($.isFunction(options)) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+        if (typeof options == 'number' || $.fx.speeds[options]) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+	if ($.isFunction(speed)) {
+		callback = speed;
+		speed = null;
+	}
+
+	options = options || {};
+
+	speed = speed || options.duration;
+	speed = $.fx.off ? 0 : typeof speed == 'number'
+		? speed : speed in $.fx.speeds ? $.fx.speeds[speed] : $.fx.speeds._default;
+
+	callback = callback || options.complete;
+
+	return [effect, options, speed, callback];
+}
+
+function standardSpeed( speed ) {
+	// valid standard speeds
+	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+		return true;
+	}
+	
+	// invalid strings - treat as "normal" speed
+	if ( typeof speed === "string" && !$.effects[ speed ] ) {
+		return true;
+	}
+	
+	return false;
+}
+
+$.fn.extend({
+	effect: function(effect, options, speed, callback) {
+		var args = _normalizeArguments.apply(this, arguments),
+			// TODO: make effects take actual parameters instead of a hash
+			args2 = {
+				options: args[1],
+				duration: args[2],
+				callback: args[3]
+			},
+			mode = args2.options.mode,
+			effectMethod = $.effects[effect];
+		
+		if ( $.fx.off || !effectMethod ) {
+			// delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args2.duration, args2.callback );
+			} else {
+				return this.each(function() {
+					if ( args2.callback ) {
+						args2.callback.call( this );
+					}
+				});
+			}
+		}
+		
+		return effectMethod.call(this, args2);
+	},
+
+	_show: $.fn.show,
+	show: function(speed) {
+		if ( standardSpeed( speed ) ) {
+			return this._show.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'show';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	_hide: $.fn.hide,
+	hide: function(speed) {
+		if ( standardSpeed( speed ) ) {
+			return this._hide.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'hide';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	// jQuery core overloads toggle and creates _toggle
+	__toggle: $.fn.toggle,
+	toggle: function(speed) {
+		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
+			return this.__toggle.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'toggle';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	// helper functions
+	cssUnit: function(key) {
+		var style = this.css(key), val = [];
+		$.each( ['em','px','%','pt'], function(i, unit){
+			if(style.indexOf(unit) > 0)
+				val = [parseFloat(style), unit];
+		});
+		return val;
+	}
+});
+
+
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ *
+ * Open source under the BSD License.
+ *
+ * Copyright 2008 George McGinley Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to endorse
+ * or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+$.easing.jswing = $.easing.swing;
+
+$.extend($.easing,
+{
+	def: 'easeOutQuad',
+	swing: function (x, t, b, c, d) {
+		//alert($.easing.default);
+		return $.easing[$.easing.def](x, t, b, c, d);
+	},
+	easeInQuad: function (x, t, b, c, d) {
+		return c*(t/=d)*t + b;
+	},
+	easeOutQuad: function (x, t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	},
+	easeInOutQuad: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	},
+	easeInCubic: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	},
+	easeOutCubic: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	},
+	easeInOutCubic: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	},
+	easeInQuart: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	},
+	easeOutQuart: function (x, t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	},
+	easeInOutQuart: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	},
+	easeInQuint: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	},
+	easeOutQuint: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	},
+	easeInOutQuint: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	},
+	easeInSine: function (x, t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	},
+	easeOutSine: function (x, t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	},
+	easeInOutSine: function (x, t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	},
+	easeInExpo: function (x, t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	},
+	easeOutExpo: function (x, t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	},
+	easeInOutExpo: function (x, t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	},
+	easeInCirc: function (x, t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	},
+	easeOutCirc: function (x, t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	},
+	easeInOutCirc: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	},
+	easeInElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	},
+	easeOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	},
+	easeInOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	},
+	easeInBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	},
+	easeOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	},
+	easeInOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	},
+	easeInBounce: function (x, t, b, c, d) {
+		return c - $.easing.easeOutBounce (x, d-t, 0, c, d) + b;
+	},
+	easeOutBounce: function (x, t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	},
+	easeInOutBounce: function (x, t, b, c, d) {
+		if (t < d/2) return $.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
+		return $.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ *
+ * Open source under the BSD License.
+ *
+ * Copyright 2001 Robert Penner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to endorse
+ * or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.blind = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'vertical'; // Default direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var ref = (direction == 'vertical') ? 'height' : 'width';
+		var distance = (direction == 'vertical') ? wrapper.height() : wrapper.width();
+		if(mode == 'show') wrapper.css(ref, 0); // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref] = mode == 'show' ? distance : 0;
+
+		// Animate
+		wrapper.animate(animation, o.duration, o.options.easing, function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		});
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.bounce = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var direction = o.options.direction || 'up'; // Default direction
+		var distance = o.options.distance || 20; // Default distance
+		var times = o.options.times || 5; // Default # of times
+		var speed = o.duration || 250; // Default speed per bounce
+		if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight(true) / 3 : el.outerWidth(true) / 3);
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+		if (mode == 'hide') distance = distance / (times * 2);
+		if (mode != 'hide') times--;
+
+		// Animate
+		if (mode == 'show') { // Show Bounce
+			var animation = {opacity: 1};
+			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation, speed / 2, o.options.easing);
+			distance = distance / 2;
+			times--;
+		};
+		for (var i = 0; i < times; i++) { // Bounces
+			var animation1 = {}, animation2 = {};
+			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
+			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing);
+			distance = (mode == 'hide') ? distance * 2 : distance / 2;
+		};
+		if (mode == 'hide') { // Last Bounce
+			var animation = {opacity: 0};
+			animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
+			el.animate(animation, speed / 2, o.options.easing, function(){
+				el.hide(); // Hide
+				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+				if(o.callback) o.callback.apply(this, arguments); // Callback
+			});
+		} else {
+			var animation1 = {}, animation2 = {};
+			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
+			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing, function(){
+				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+				if(o.callback) o.callback.apply(this, arguments); // Callback
+			});
+		};
+		el.queue('fx', function() { el.dequeue(); });
+		el.dequeue();
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.clip = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','height','width'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'vertical'; // Default direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var animate = el[0].tagName == 'IMG' ? wrapper : el;
+		var ref = {
+			size: (direction == 'vertical') ? 'height' : 'width',
+			position: (direction == 'vertical') ? 'top' : 'left'
+		};
+		var distance = (direction == 'vertical') ? animate.height() : animate.width();
+		if(mode == 'show') { animate.css(ref.size, 0); animate.css(ref.position, distance / 2); } // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref.size] = mode == 'show' ? distance : 0;
+		animation[ref.position] = mode == 'show' ? 0 : distance / 2;
+
+		// Animate
+		animate.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.drop = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','opacity'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default Direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight( true ) / 2 : el.outerWidth( true ) / 2);
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+
+		// Animation
+		var animation = {opacity: mode == 'show' ? 1 : 0};
+		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
+
+		// Animate
+		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.explode = function(o) {
+
+	return this.queue(function() {
+
+	var rows = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
+	var cells = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
+
+	o.options.mode = o.options.mode == 'toggle' ? ($(this).is(':visible') ? 'hide' : 'show') : o.options.mode;
+	var el = $(this).show().css('visibility', 'hidden');
+	var offset = el.offset();
+
+	//Substract the margins - not fixing the problem yet.
+	offset.top -= parseInt(el.css("marginTop"),10) || 0;
+	offset.left -= parseInt(el.css("marginLeft"),10) || 0;
+
+	var width = el.outerWidth(true);
+	var height = el.outerHeight(true);
+
+	for(var i=0;i<rows;i++) { // =
+		for(var j=0;j<cells;j++) { // ||
+			el
+				.clone()
+				.appendTo('body')
+				.wrap('<div></div>')
+				.css({
+					position: 'absolute',
+					visibility: 'visible',
+					left: -j*(width/cells),
+					top: -i*(height/rows)
+				})
+				.parent()
+				.addClass('ui-effects-explode')
+				.css({
+					position: 'absolute',
+					overflow: 'hidden',
+					width: width/cells,
+					height: height/rows,
+					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
+					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
+					opacity: o.options.mode == 'show' ? 0 : 1
+				}).animate({
+					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
+					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
+					opacity: o.options.mode == 'show' ? 1 : 0
+				}, o.duration || 500);
+		}
+	}
+
+	// Set a timeout, to call the callback approx. when the other animations have finished
+	setTimeout(function() {
+
+		o.options.mode == 'show' ? el.css({ visibility: 'visible' }) : el.css({ visibility: 'visible' }).hide();
+				if(o.callback) o.callback.apply(el[0]); // Callback
+				el.dequeue();
+
+				$('div.ui-effects-explode').remove();
+
+	}, o.duration || 500);
+
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.fade = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'hide');
+
+		elem.animate({ opacity: mode }, {
+			queue: false,
+			duration: o.duration,
+			easing: o.options.easing,
+			complete: function() {
+				(o.callback && o.callback.apply(this, arguments));
+				elem.dequeue();
+			}
+		});
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.fold = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var size = o.options.size || 15; // Default fold size
+		var horizFirst = !(!o.options.horizFirst); // Ensure a boolean value
+		var duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2;
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var widthFirst = ((mode == 'show') != horizFirst);
+		var ref = widthFirst ? ['width', 'height'] : ['height', 'width'];
+		var distance = widthFirst ? [wrapper.width(), wrapper.height()] : [wrapper.height(), wrapper.width()];
+		var percent = /([0-9]+)%/.exec(size);
+		if(percent) size = parseInt(percent[1],10) / 100 * distance[mode == 'hide' ? 0 : 1];
+		if(mode == 'show') wrapper.css(horizFirst ? {height: 0, width: size} : {height: size, width: 0}); // Shift
+
+		// Animation
+		var animation1 = {}, animation2 = {};
+		animation1[ref[0]] = mode == 'show' ? distance[0] : size;
+		animation2[ref[1]] = mode == 'show' ? distance[1] : 0;
+
+		// Animate
+		wrapper.animate(animation1, duration, o.options.easing)
+		.animate(animation2, duration, o.options.easing, function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		});
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.highlight = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			props = ['backgroundImage', 'backgroundColor', 'opacity'],
+			mode = $.effects.setMode(elem, o.options.mode || 'show'),
+			animation = {
+				backgroundColor: elem.css('backgroundColor')
+			};
+
+		if (mode == 'hide') {
+			animation.opacity = 0;
+		}
+
+		$.effects.save(elem, props);
+		elem
+			.show()
+			.css({
+				backgroundImage: 'none',
+				backgroundColor: o.options.color || '#ffff99'
+			})
+			.animate(animation, {
+				queue: false,
+				duration: o.duration,
+				easing: o.options.easing,
+				complete: function() {
+					(mode == 'hide' && elem.hide());
+					$.effects.restore(elem, props);
+					(mode == 'show' && !$.support.opacity && this.style.removeAttribute('filter'));
+					(o.callback && o.callback.apply(this, arguments));
+					elem.dequeue();
+				}
+			});
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.pulsate = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'show'),
+			times = ((o.options.times || 5) * 2) - 1,
+			duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2,
+			isVisible = elem.is(':visible'),
+			animateTo = 0;
+
+		if (!isVisible) {
+			elem.css('opacity', 0).show();
+			animateTo = 1;
+		}
+
+		if ((mode == 'hide' && isVisible) || (mode == 'show' && !isVisible)) {
+			times--;
+		}
+
+		for (var i = 0; i < times; i++) {
+			elem.animate({ opacity: animateTo }, duration, o.options.easing);
+			animateTo = (animateTo + 1) % 2;
+		}
+
+		elem.animate({ opacity: animateTo }, duration, o.options.easing, function() {
+			if (animateTo == 0) {
+				elem.hide();
+			}
+			(o.callback && o.callback.apply(this, arguments));
+		});
+
+		elem
+			.queue('fx', function() { elem.dequeue(); })
+			.dequeue();
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.puff = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'hide'),
+			percent = parseInt(o.options.percent, 10) || 150,
+			factor = percent / 100,
+			original = { height: elem.height(), width: elem.width() };
+
+		$.extend(o.options, {
+			fade: true,
+			mode: mode,
+			percent: mode == 'hide' ? percent : 100,
+			from: mode == 'hide'
+				? original
+				: {
+					height: original.height * factor,
+					width: original.width * factor
+				}
+		});
+
+		elem.effect('scale', o.options, o.duration, o.callback);
+		elem.dequeue();
+	});
+};
+
+$.effects.scale = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this);
+
+		// Set options
+		var options = $.extend(true, {}, o.options);
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var percent = parseInt(o.options.percent,10) || (parseInt(o.options.percent,10) == 0 ? 0 : (mode == 'hide' ? 0 : 100)); // Set default scaling percent
+		var direction = o.options.direction || 'both'; // Set default axis
+		var origin = o.options.origin; // The origin of the scaling
+		if (mode != 'effect') { // Set default origin and restore for show/hide
+			options.origin = origin || ['middle','center'];
+			options.restore = true;
+		}
+		var original = {height: el.height(), width: el.width()}; // Save original
+		el.from = o.options.from || (mode == 'show' ? {height: 0, width: 0} : original); // Default from state
+
+		// Adjust
+		var factor = { // Set scaling factor
+			y: direction != 'horizontal' ? (percent / 100) : 1,
+			x: direction != 'vertical' ? (percent / 100) : 1
+		};
+		el.to = {height: original.height * factor.y, width: original.width * factor.x}; // Set to state
+
+		if (o.options.fade) { // Fade option to support puff
+			if (mode == 'show') {el.from.opacity = 0; el.to.opacity = 1;};
+			if (mode == 'hide') {el.from.opacity = 1; el.to.opacity = 0;};
+		};
+
+		// Animation
+		options.from = el.from; options.to = el.to; options.mode = mode;
+
+		// Animate
+		el.effect('size', options, o.duration, o.callback);
+		el.dequeue();
+	});
+
+};
+
+$.effects.size = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','width','height','overflow','opacity'];
+		var props1 = ['position','top','bottom','left','right','overflow','opacity']; // Always restore
+		var props2 = ['width','height','overflow']; // Copy for children
+		var cProps = ['fontSize'];
+		var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
+		var hProps = ['borderLeftWidth', 'borderRightWidth', 'paddingLeft', 'paddingRight'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var restore = o.options.restore || false; // Default restore
+		var scale = o.options.scale || 'both'; // Default scale mode
+		var origin = o.options.origin; // The origin of the sizing
+		var original = {height: el.height(), width: el.width()}; // Save original
+		el.from = o.options.from || original; // Default from state
+		el.to = o.options.to || original; // Default to state
+		// Adjust
+		if (origin) { // Calculate baseline shifts
+			var baseline = $.effects.getBaseline(origin, original);
+			el.from.top = (original.height - el.from.height) * baseline.y;
+			el.from.left = (original.width - el.from.width) * baseline.x;
+			el.to.top = (original.height - el.to.height) * baseline.y;
+			el.to.left = (original.width - el.to.width) * baseline.x;
+		};
+		var factor = { // Set scaling factor
+			from: {y: el.from.height / original.height, x: el.from.width / original.width},
+			to: {y: el.to.height / original.height, x: el.to.width / original.width}
+		};
+		if (scale == 'box' || scale == 'both') { // Scale the css box
+			if (factor.from.y != factor.to.y) { // Vertical props scaling
+				props = props.concat(vProps);
+				el.from = $.effects.setTransition(el, vProps, factor.from.y, el.from);
+				el.to = $.effects.setTransition(el, vProps, factor.to.y, el.to);
+			};
+			if (factor.from.x != factor.to.x) { // Horizontal props scaling
+				props = props.concat(hProps);
+				el.from = $.effects.setTransition(el, hProps, factor.from.x, el.from);
+				el.to = $.effects.setTransition(el, hProps, factor.to.x, el.to);
+			};
+		};
+		if (scale == 'content' || scale == 'both') { // Scale the content
+			if (factor.from.y != factor.to.y) { // Vertical props scaling
+				props = props.concat(cProps);
+				el.from = $.effects.setTransition(el, cProps, factor.from.y, el.from);
+				el.to = $.effects.setTransition(el, cProps, factor.to.y, el.to);
+			};
+		};
+		$.effects.save(el, restore ? props : props1); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		el.css('overflow','hidden').css(el.from); // Shift
+
+		// Animate
+		if (scale == 'content' || scale == 'both') { // Scale the children
+			vProps = vProps.concat(['marginTop','marginBottom']).concat(cProps); // Add margins/font-size
+			hProps = hProps.concat(['marginLeft','marginRight']); // Add margins
+			props2 = props.concat(vProps).concat(hProps); // Concat
+			el.find("*[width]").each(function(){
+				var child = $(this);
+				if (restore) $.effects.save(child, props2);
+				var c_original = {height: child.height(), width: child.width()}; // Save original
+				child.from = {height: c_original.height * factor.from.y, width: c_original.width * factor.from.x};
+				child.to = {height: c_original.height * factor.to.y, width: c_original.width * factor.to.x};
+				if (factor.from.y != factor.to.y) { // Vertical props scaling
+					child.from = $.effects.setTransition(child, vProps, factor.from.y, child.from);
+					child.to = $.effects.setTransition(child, vProps, factor.to.y, child.to);
+				};
+				if (factor.from.x != factor.to.x) { // Horizontal props scaling
+					child.from = $.effects.setTransition(child, hProps, factor.from.x, child.from);
+					child.to = $.effects.setTransition(child, hProps, factor.to.x, child.to);
+				};
+				child.css(child.from); // Shift children
+				child.animate(child.to, o.duration, o.options.easing, function(){
+					if (restore) $.effects.restore(child, props2); // Restore children
+				}); // Animate children
+			});
+		};
+
+		// Animate
+		el.animate(el.to, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if (el.to.opacity === 0) {
+				el.css('opacity', el.from.opacity);
+			}
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, restore ? props : props1); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.shake = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default direction
+		var distance = o.options.distance || 20; // Default distance
+		var times = o.options.times || 3; // Default # of times
+		var speed = o.duration || o.options.duration || 140; // Default speed per shake
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+
+		// Animation
+		var animation = {}, animation1 = {}, animation2 = {};
+		animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
+		animation1[ref] = (motion == 'pos' ? '+=' : '-=')  + distance * 2;
+		animation2[ref] = (motion == 'pos' ? '-=' : '+=')  + distance * 2;
+
+		// Animate
+		el.animate(animation, speed, o.options.easing);
+		for (var i = 1; i < times; i++) { // Shakes
+			el.animate(animation1, speed, o.options.easing).animate(animation2, speed, o.options.easing);
+		};
+		el.animate(animation1, speed, o.options.easing).
+		animate(animation, speed / 2, o.options.easing, function(){ // Last shake
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+		});
+		el.queue('fx', function() { el.dequeue(); });
+		el.dequeue();
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.slide = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default Direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight( true ) : el.outerWidth( true ));
+		if (mode == 'show') el.css(ref, motion == 'pos' ? (isNaN(distance) ? "-" + distance : -distance) : distance); // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
+
+		// Animate
+		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.transfer = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			target = $(o.options.to),
+			endPosition = target.offset(),
+			animation = {
+				top: endPosition.top,
+				left: endPosition.left,
+				height: target.innerHeight(),
+				width: target.innerWidth()
+			},
+			startPosition = elem.offset(),
+			transfer = $('<div class="ui-effects-transfer"></div>')
+				.appendTo(document.body)
+				.addClass(o.options.className)
+				.css({
+					top: startPosition.top,
+					left: startPosition.left,
+					height: elem.innerHeight(),
+					width: elem.innerWidth(),
+					position: 'absolute'
+				})
+				.animate(animation, o.duration, o.options.easing, function() {
+					transfer.remove();
+					(o.callback && o.callback.apply(elem[0], arguments));
+					elem.dequeue();
+				});
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget( "ui.accordion", {
+	options: {
+		active: 0,
+		animated: "slide",
+		autoHeight: true,
+		clearStyle: false,
+		collapsible: false,
+		event: "click",
+		fillSpace: false,
+		header: "> li > :first-child,> :not(li):even",
+		icons: {
+			header: "ui-icon-triangle-1-e",
+			headerSelected: "ui-icon-triangle-1-s"
+		},
+		navigation: false,
+		navigationFilter: function() {
+			return this.href.toLowerCase() === location.href.toLowerCase();
+		}
+	},
+
+	_create: function() {
+		var self = this,
+			options = self.options;
+
+		self.running = 0;
+
+		self.element
+			.addClass( "ui-accordion ui-widget ui-helper-reset" )
+			// in lack of child-selectors in CSS
+			// we need to mark top-LIs in a UL-accordion for some IE-fix
+			.children( "li" )
+				.addClass( "ui-accordion-li-fix" );
+
+		self.headers = self.element.find( options.header )
+			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" )
+			.bind( "mouseenter.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+			})
+			.bind( "mouseleave.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.bind( "focus.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-focus" );
+			})
+			.bind( "blur.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		self.headers.next()
+			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" );
+
+		if ( options.navigation ) {
+			var current = self.element.find( "a" ).filter( options.navigationFilter ).eq( 0 );
+			if ( current.length ) {
+				var header = current.closest( ".ui-accordion-header" );
+				if ( header.length ) {
+					// anchor within header
+					self.active = header;
+				} else {
+					// anchor within content
+					self.active = current.closest( ".ui-accordion-content" ).prev();
+				}
+			}
+		}
+
+		self.active = self._findActive( self.active || options.active )
+			.addClass( "ui-state-default ui-state-active" )
+			.toggleClass( "ui-corner-all" )
+			.toggleClass( "ui-corner-top" );
+		self.active.next().addClass( "ui-accordion-content-active" );
+
+		self._createIcons();
+		self.resize();
+		
+		// ARIA
+		self.element.attr( "role", "tablist" );
+
+		self.headers
+			.attr( "role", "tab" )
+			.bind( "keydown.accordion", function( event ) {
+				return self._keydown( event );
+			})
+			.next()
+				.attr( "role", "tabpanel" );
+
+		self.headers
+			.not( self.active || "" )
+			.attr({
+				"aria-expanded": "false",
+				"aria-selected": "false",
+				tabIndex: -1
+			})
+			.next()
+				.hide();
+
+		// make sure at least one header is in the tab order
+		if ( !self.active.length ) {
+			self.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			self.active
+				.attr({
+					"aria-expanded": "true",
+					"aria-selected": "true",
+					tabIndex: 0
+				});
+		}
+
+		// only need links in tab order for Safari
+		if ( !$.browser.safari ) {
+			self.headers.find( "a" ).attr( "tabIndex", -1 );
+		}
+
+		if ( options.event ) {
+			self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion", function(event) {
+				self._clickHandler.call( self, event, this );
+				event.preventDefault();
+			});
+		}
+	},
+
+	_createIcons: function() {
+		var options = this.options;
+		if ( options.icons ) {
+			$( "<span></span>" )
+				.addClass( "ui-icon " + options.icons.header )
+				.prependTo( this.headers );
+			this.active.children( ".ui-icon" )
+				.toggleClass(options.icons.header)
+				.toggleClass(options.icons.headerSelected);
+			this.element.addClass( "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this.headers.children( ".ui-icon" ).remove();
+		this.element.removeClass( "ui-accordion-icons" );
+	},
+
+	destroy: function() {
+		var options = this.options;
+
+		this.element
+			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
+			.removeAttr( "role" );
+
+		this.headers
+			.unbind( ".accordion" )
+			.removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
+			.removeAttr( "aria-selected" )
+			.removeAttr( "tabIndex" );
+
+		this.headers.find( "a" ).removeAttr( "tabIndex" );
+		this._destroyIcons();
+		var contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role" )
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled" );
+		if ( options.autoHeight || options.fillHeight ) {
+			contents.css( "height", "" );
+		}
+
+		return $.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+			
+		if ( key == "active" ) {
+			this.activate( value );
+		}
+		if ( key == "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+		// #5332 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		if ( key == "disabled" ) {
+			this.headers.add(this.headers.next())
+				[ value ? "addClass" : "removeClass" ](
+					"ui-accordion-disabled ui-state-disabled" );
+		}
+	},
+
+	_keydown: function( event ) {
+		if ( this.options.disabled || event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+			case keyCode.RIGHT:
+			case keyCode.DOWN:
+				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+				break;
+			case keyCode.LEFT:
+			case keyCode.UP:
+				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+				break;
+			case keyCode.SPACE:
+			case keyCode.ENTER:
+				this._clickHandler( { target: event.target }, event.target );
+				event.preventDefault();
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			toFocus.focus();
+			return false;
+		}
+
+		return true;
+	},
+
+	resize: function() {
+		var options = this.options,
+			maxHeight;
+
+		if ( options.fillSpace ) {
+			if ( $.browser.msie ) {
+				var defOverflow = this.element.parent().css( "overflow" );
+				this.element.parent().css( "overflow", "hidden");
+			}
+			maxHeight = this.element.parent().height();
+			if ($.browser.msie) {
+				this.element.parent().css( "overflow", defOverflow );
+			}
+
+			this.headers.each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.headers.next()
+				.each(function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				})
+				.css( "overflow", "auto" );
+		} else if ( options.autoHeight ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each(function() {
+					maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+				})
+				.height( maxHeight );
+		}
+
+		return this;
+	},
+
+	activate: function( index ) {
+		// TODO this gets called on init, changing the option without an explicit call for that
+		this.options.active = index;
+		// call clickHandler with custom event
+		var active = this._findActive( index )[ 0 ];
+		this._clickHandler( { target: active }, active );
+
+		return this;
+	},
+
+	_findActive: function( selector ) {
+		return selector
+			? typeof selector === "number"
+				? this.headers.filter( ":eq(" + selector + ")" )
+				: this.headers.not( this.headers.not( selector ) )
+			: selector === false
+				? $( [] )
+				: this.headers.filter( ":eq(0)" );
+	},
+
+	// TODO isn't event.target enough? why the separate target argument?
+	_clickHandler: function( event, target ) {
+		var options = this.options;
+		if ( options.disabled ) {
+			return;
+		}
+
+		// called only when using activate(false) to close all parts programmatically
+		if ( !event.target ) {
+			if ( !options.collapsible ) {
+				return;
+			}
+			this.active
+				.removeClass( "ui-state-active ui-corner-top" )
+				.addClass( "ui-state-default ui-corner-all" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.headerSelected )
+					.addClass( options.icons.header );
+			this.active.next().addClass( "ui-accordion-content-active" );
+			var toHide = this.active.next(),
+				data = {
+					options: options,
+					newHeader: $( [] ),
+					oldHeader: options.active,
+					newContent: $( [] ),
+					oldContent: toHide
+				},
+				toShow = ( this.active = $( [] ) );
+			this._toggle( toShow, toHide, data );
+			return;
+		}
+
+		// get the click target
+		var clicked = $( event.currentTarget || target ),
+			clickedIsActive = clicked[0] === this.active[0];
+
+		// TODO the option is changed, is that correct?
+		// TODO if it is correct, shouldn't that happen after determining that the click is valid?
+		options.active = options.collapsible && clickedIsActive ?
+			false :
+			this.headers.index( clicked );
+
+		// if animations are still active, or the active header is the target, ignore click
+		if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
+			return;
+		}
+
+		// find elements to show and hide
+		var active = this.active,
+			toShow = clicked.next(),
+			toHide = this.active.next(),
+			data = {
+				options: options,
+				newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
+				oldHeader: this.active,
+				newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
+				oldContent: toHide
+			},
+			down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
+
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $([]) : clicked;
+		this._toggle( toShow, toHide, data, clickedIsActive, down );
+
+		// switch classes
+		active
+			.removeClass( "ui-state-active ui-corner-top" )
+			.addClass( "ui-state-default ui-corner-all" )
+			.children( ".ui-icon" )
+				.removeClass( options.icons.headerSelected )
+				.addClass( options.icons.header );
+		if ( !clickedIsActive ) {
+			clicked
+				.removeClass( "ui-state-default ui-corner-all" )
+				.addClass( "ui-state-active ui-corner-top" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.header )
+					.addClass( options.icons.headerSelected );
+			clicked
+				.next()
+				.addClass( "ui-accordion-content-active" );
+		}
+
+		return;
+	},
+
+	_toggle: function( toShow, toHide, data, clickedIsActive, down ) {
+		var self = this,
+			options = self.options;
+
+		self.toShow = toShow;
+		self.toHide = toHide;
+		self.data = data;
+
+		var complete = function() {
+			if ( !self ) {
+				return;
+			}
+			return self._completed.apply( self, arguments );
+		};
+
+		// trigger changestart event
+		self._trigger( "changestart", null, self.data );
+
+		// count elements to animate
+		self.running = toHide.size() === 0 ? toShow.size() : toHide.size();
+
+		if ( options.animated ) {
+			var animOptions = {};
+
+			if ( options.collapsible && clickedIsActive ) {
+				animOptions = {
+					toShow: $( [] ),
+					toHide: toHide,
+					complete: complete,
+					down: down,
+					autoHeight: options.autoHeight || options.fillSpace
+				};
+			} else {
+				animOptions = {
+					toShow: toShow,
+					toHide: toHide,
+					complete: complete,
+					down: down,
+					autoHeight: options.autoHeight || options.fillSpace
+				};
+			}
+
+			if ( !options.proxied ) {
+				options.proxied = options.animated;
+			}
+
+			if ( !options.proxiedDuration ) {
+				options.proxiedDuration = options.duration;
+			}
+
+			options.animated = $.isFunction( options.proxied ) ?
+				options.proxied( animOptions ) :
+				options.proxied;
+
+			options.duration = $.isFunction( options.proxiedDuration ) ?
+				options.proxiedDuration( animOptions ) :
+				options.proxiedDuration;
+
+			var animations = $.ui.accordion.animations,
+				duration = options.duration,
+				easing = options.animated;
+
+			if ( easing && !animations[ easing ] && !$.easing[ easing ] ) {
+				easing = "slide";
+			}
+			if ( !animations[ easing ] ) {
+				animations[ easing ] = function( options ) {
+					this.slide( options, {
+						easing: easing,
+						duration: duration || 700
+					});
+				};
+			}
+
+			animations[ easing ]( animOptions );
+		} else {
+			if ( options.collapsible && clickedIsActive ) {
+				toShow.toggle();
+			} else {
+				toHide.hide();
+				toShow.show();
+			}
+
+			complete( true );
+		}
+
+		// TODO assert that the blur and focus triggers are really necessary, remove otherwise
+		toHide.prev()
+			.attr({
+				"aria-expanded": "false",
+				"aria-selected": "false",
+				tabIndex: -1
+			})
+			.blur();
+		toShow.prev()
+			.attr({
+				"aria-expanded": "true",
+				"aria-selected": "true",
+				tabIndex: 0
+			})
+			.focus();
+	},
+
+	_completed: function( cancel ) {
+		this.running = cancel ? 0 : --this.running;
+		if ( this.running ) {
+			return;
+		}
+
+		if ( this.options.clearStyle ) {
+			this.toShow.add( this.toHide ).css({
+				height: "",
+				overflow: ""
+			});
+		}
+
+		// other classes are removed before the animation; this one needs to stay until completed
+		this.toHide.removeClass( "ui-accordion-content-active" );
+		// Work around for rendering bug in IE (#5421)
+		if ( this.toHide.length ) {
+			this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+		}
+
+		this._trigger( "change", null, this.data );
+	}
+});
+
+$.extend( $.ui.accordion, {
+	version: "1.8.22",
+	animations: {
+		slide: function( options, additions ) {
+			options = $.extend({
+				easing: "swing",
+				duration: 300
+			}, options, additions );
+			if ( !options.toHide.size() ) {
+				options.toShow.animate({
+					height: "show",
+					paddingTop: "show",
+					paddingBottom: "show"
+				}, options );
+				return;
+			}
+			if ( !options.toShow.size() ) {
+				options.toHide.animate({
+					height: "hide",
+					paddingTop: "hide",
+					paddingBottom: "hide"
+				}, options );
+				return;
+			}
+			var overflow = options.toShow.css( "overflow" ),
+				percentDone = 0,
+				showProps = {},
+				hideProps = {},
+				fxAttrs = [ "height", "paddingTop", "paddingBottom" ],
+				originalWidth;
+			// fix width before calculating height of hidden element
+			var s = options.toShow;
+			originalWidth = s[0].style.width;
+			s.width( s.parent().width()
+				- parseFloat( s.css( "paddingLeft" ) )
+				- parseFloat( s.css( "paddingRight" ) )
+				- ( parseFloat( s.css( "borderLeftWidth" ) ) || 0 )
+				- ( parseFloat( s.css( "borderRightWidth" ) ) || 0 ) );
+
+			$.each( fxAttrs, function( i, prop ) {
+				hideProps[ prop ] = "hide";
+
+				var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ );
+				showProps[ prop ] = {
+					value: parts[ 1 ],
+					unit: parts[ 2 ] || "px"
+				};
+			});
+			options.toShow.css({ height: 0, overflow: "hidden" }).show();
+			options.toHide
+				.filter( ":hidden" )
+					.each( options.complete )
+				.end()
+				.filter( ":visible" )
+				.animate( hideProps, {
+				step: function( now, settings ) {
+					// only calculate the percent when animating height
+					// IE gets very inconsistent results when animating elements
+					// with small values, which is common for padding
+					if ( settings.prop == "height" ) {
+						percentDone = ( settings.end - settings.start === 0 ) ? 0 :
+							( settings.now - settings.start ) / ( settings.end - settings.start );
+					}
+
+					options.toShow[ 0 ].style[ settings.prop ] =
+						( percentDone * showProps[ settings.prop ].value )
+						+ showProps[ settings.prop ].unit;
+				},
+				duration: options.duration,
+				easing: options.easing,
+				complete: function() {
+					if ( !options.autoHeight ) {
+						options.toShow.css( "height", "" );
+					}
+					options.toShow.css({
+						width: originalWidth,
+						overflow: overflow
+					});
+					options.complete();
+				}
+			});
+		},
+		bounceslide: function( options ) {
+			this.slide( options, {
+				easing: options.down ? "easeOutBounce" : "swing",
+				duration: options.down ? 1000 : 200
+			});
+		}
+	}
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
+
+$.widget( "ui.autocomplete", {
+	options: {
+		appendTo: "body",
+		autoFocus: false,
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null
+	},
+
+	pending: 0,
+
+	_create: function() {
+		var self = this,
+			doc = this.element[ 0 ].ownerDocument,
+			suppressKeyPress;
+		this.isMultiLine = this.element.is( "textarea" );
+
+		this.element
+			.addClass( "ui-autocomplete-input" )
+			.attr( "autocomplete", "off" )
+			// TODO verify these actually work as intended
+			.attr({
+				role: "textbox",
+				"aria-autocomplete": "list",
+				"aria-haspopup": "true"
+			})
+			.bind( "keydown.autocomplete", function( event ) {
+				if ( self.options.disabled || self.element.propAttr( "readOnly" ) ) {
+					return;
+				}
+
+				suppressKeyPress = false;
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					self._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					self._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					self._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					self._keyEvent( "next", event );
+					break;
+				case keyCode.ENTER:
+				case keyCode.NUMPAD_ENTER:
+					// when menu is open and has focus
+					if ( self.menu.active ) {
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+					}
+					//passthrough - ENTER and TAB both select the current element
+				case keyCode.TAB:
+					if ( !self.menu.active ) {
+						return;
+					}
+					self.menu.select( event );
+					break;
+				case keyCode.ESCAPE:
+					self.element.val( self.term );
+					self.close( event );
+					break;
+				default:
+					// keypress is triggered before the input value is changed
+					clearTimeout( self.searching );
+					self.searching = setTimeout(function() {
+						// only search if the value has changed
+						if ( self.term != self.element.val() ) {
+							self.selectedItem = null;
+							self.search( null, event );
+						}
+					}, self.options.delay );
+					break;
+				}
+			})
+			.bind( "keypress.autocomplete", function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					event.preventDefault();
+				}
+			})
+			.bind( "focus.autocomplete", function() {
+				if ( self.options.disabled ) {
+					return;
+				}
+
+				self.selectedItem = null;
+				self.previous = self.element.val();
+			})
+			.bind( "blur.autocomplete", function( event ) {
+				if ( self.options.disabled ) {
+					return;
+				}
+
+				clearTimeout( self.searching );
+				// clicks on the menu (or a button to trigger a search) will cause a blur event
+				self.closing = setTimeout(function() {
+					self.close( event );
+					self._change( event );
+				}, 150 );
+			});
+		this._initSource();
+		this.menu = $( "<ul></ul>" )
+			.addClass( "ui-autocomplete" )
+			.appendTo( $( this.options.appendTo || "body", doc )[0] )
+			// prevent the close-on-blur in case of a "slow" click on the menu (long mousedown)
+			.mousedown(function( event ) {
+				// clicking on the scrollbar causes focus to shift to the body
+				// but we can't detect a mouseup or a click immediately afterward
+				// so we have to track the next mousedown and close the menu if
+				// the user clicks somewhere outside of the autocomplete
+				var menuElement = self.menu.element[ 0 ];
+				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+					setTimeout(function() {
+						$( document ).one( 'mousedown', function( event ) {
+							if ( event.target !== self.element[ 0 ] &&
+								event.target !== menuElement &&
+								!$.ui.contains( menuElement, event.target ) ) {
+								self.close();
+							}
+						});
+					}, 1 );
+				}
+
+				// use another timeout to make sure the blur-event-handler on the input was already triggered
+				setTimeout(function() {
+					clearTimeout( self.closing );
+				}, 13);
+			})
+			.menu({
+				focus: function( event, ui ) {
+					var item = ui.item.data( "item.autocomplete" );
+					if ( false !== self._trigger( "focus", event, { item: item } ) ) {
+						// use value to match what will end up in the input, if it was a key event
+						if ( /^key/.test(event.originalEvent.type) ) {
+							self.element.val( item.value );
+						}
+					}
+				},
+				selected: function( event, ui ) {
+					var item = ui.item.data( "item.autocomplete" ),
+						previous = self.previous;
+
+					// only trigger when focus was lost (click on menu)
+					if ( self.element[0] !== doc.activeElement ) {
+						self.element.focus();
+						self.previous = previous;
+						// #6109 - IE triggers two focus events and the second
+						// is asynchronous, so we need to reset the previous
+						// term synchronously and asynchronously :-(
+						setTimeout(function() {
+							self.previous = previous;
+							self.selectedItem = item;
+						}, 1);
+					}
+
+					if ( false !== self._trigger( "select", event, { item: item } ) ) {
+						self.element.val( item.value );
+					}
+					// reset the term after the select event
+					// this allows custom select handling to work properly
+					self.term = self.element.val();
+
+					self.close( event );
+					self.selectedItem = item;
+				},
+				blur: function( event, ui ) {
+					// don't set the value of the text field if it's already correct
+					// this prevents moving the cursor unnecessarily
+					if ( self.menu.element.is(":visible") &&
+						( self.element.val() !== self.term ) ) {
+						self.element.val( self.term );
+					}
+				}
+			})
+			.zIndex( this.element.zIndex() + 1 )
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.hide()
+			.data( "menu" );
+		if ( $.fn.bgiframe ) {
+			 this.menu.element.bgiframe();
+		}
+		// turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		self.beforeunloadHandler = function() {
+			self.element.removeAttr( "autocomplete" );
+		};
+		$( window ).bind( "beforeunload", self.beforeunloadHandler );
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-autocomplete-input" )
+			.removeAttr( "autocomplete" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-autocomplete" )
+			.removeAttr( "aria-haspopup" );
+		this.menu.element.remove();
+		$( window ).unbind( "beforeunload", this.beforeunloadHandler );
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_initSource: function() {
+		var self = this,
+			array,
+			url;
+		if ( $.isArray(this.options.source) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter(array, request.term) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( self.xhr ) {
+					self.xhr.abort();
+				}
+				self.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data, status ) {
+						response( data );
+					},
+					error: function() {
+						response( [] );
+					}
+				});
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this.element.val();
+
+		// always save the actual value, not the one passed as an argument
+		this.term = this.element.val();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		clearTimeout( this.closing );
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this.element.addClass( "ui-autocomplete-loading" );
+
+		this.source( { term: value }, this._response() );
+	},
+
+	_response: function() {
+		var that = this,
+			index = ++requestIndex;
+
+		return function( content ) {
+			if ( index === requestIndex ) {
+				that.__response( content );
+			}
+
+			that.pending--;
+			if ( !that.pending ) {
+				that.element.removeClass( "ui-autocomplete-loading" );
+			}
+		};
+	},
+
+	__response: function( content ) {
+		if ( !this.options.disabled && content && content.length ) {
+			content = this._normalize( content );
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+			this.close();
+		}
+	},
+
+	close: function( event ) {
+		clearTimeout( this.closing );
+		if ( this.menu.element.is(":visible") ) {
+			this.menu.element.hide();
+			this.menu.deactivate();
+			this._trigger( "close", event );
+		}
+	},
+	
+	_change: function( event ) {
+		if ( this.previous !== this.element.val() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[0].label && items[0].value ) {
+			return items;
+		}
+		return $.map( items, function(item) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend({
+				label: item.label || item.value,
+				value: item.value || item.label
+			}, item );
+		});
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element
+			.empty()
+			.zIndex( this.element.zIndex() + 1 );
+		this._renderMenu( ul, items );
+		// TODO refresh should check if the active item is still in the dom, removing the need for a manual deactivate
+		this.menu.deactivate();
+		this.menu.refresh();
+
+		// size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend({
+			of: this.element
+		}, this.options.position ));
+
+		if ( this.options.autoFocus ) {
+			this.menu.next( new $.Event("mouseover") );
+		}
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+			// Firefox wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping (#7513)
+			ul.width( "" ).outerWidth() + 1,
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var self = this;
+		$.each( items, function( index, item ) {
+			self._renderItem( ul, item );
+		});
+	},
+
+	_renderItem: function( ul, item) {
+		return $( "<li></li>" )
+			.data( "item.autocomplete", item )
+			.append( $( "<a></a>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is(":visible") ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.first() && /^previous/.test(direction) ||
+				this.menu.last() && /^next/.test(direction) ) {
+			this.element.val( this.term );
+			this.menu.deactivate();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	},
+	_keyEvent: function( keyEvent, event ) {
+		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+			this._move( keyEvent, event );
+
+			// prevents moving cursor to beginning/end of the text field in some browsers
+			event.preventDefault();
+		}
+	}
+});
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+	},
+	filter: function(array, term) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+		return $.grep( array, function(value) {
+			return matcher.test( value.label || value.value || value );
+		});
+	}
+});
+
+}( jQuery ));
+
+/*
+ * jQuery UI Menu (not officially released)
+ * 
+ * This widget isn't yet finished and the API is subject to change. We plan to finish
+ * it for the next release. You're welcome to give it a try anyway and give us feedback,
+ * as long as you're okay with migrating your code later on. We can help with that, too.
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *  jquery.ui.widget.js
+ */
+(function($) {
+
+$.widget("ui.menu", {
+	_create: function() {
+		var self = this;
+		this.element
+			.addClass("ui-menu ui-widget ui-widget-content ui-corner-all")
+			.attr({
+				role: "listbox",
+				"aria-activedescendant": "ui-active-menuitem"
+			})
+			.click(function( event ) {
+				if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) {
+					return;
+				}
+				// temporary
+				event.preventDefault();
+				self.select( event );
+			});
+		this.refresh();
+	},
+	
+	refresh: function() {
+		var self = this;
+
+		// don't refresh list items that are already adapted
+		var items = this.element.children("li:not(.ui-menu-item):has(a)")
+			.addClass("ui-menu-item")
+			.attr("role", "menuitem");
+		
+		items.children("a")
+			.addClass("ui-corner-all")
+			.attr("tabindex", -1)
+			// mouseenter doesn't work with event delegation
+			.mouseenter(function( event ) {
+				self.activate( event, $(this).parent() );
+			})
+			.mouseleave(function() {
+				self.deactivate();
+			});
+	},
+
+	activate: function( event, item ) {
+		this.deactivate();
+		if (this.hasScroll()) {
+			var offset = item.offset().top - this.element.offset().top,
+				scroll = this.element.scrollTop(),
+				elementHeight = this.element.height();
+			if (offset < 0) {
+				this.element.scrollTop( scroll + offset);
+			} else if (offset >= elementHeight) {
+				this.element.scrollTop( scroll + offset - elementHeight + item.height());
+			}
+		}
+		this.active = item.eq(0)
+			.children("a")
+				.addClass("ui-state-hover")
+				.attr("id", "ui-active-menuitem")
+			.end();
+		this._trigger("focus", event, { item: item });
+	},
+
+	deactivate: function() {
+		if (!this.active) { return; }
+
+		this.active.children("a")
+			.removeClass("ui-state-hover")
+			.removeAttr("id");
+		this._trigger("blur");
+		this.active = null;
+	},
+
+	next: function(event) {
+		this.move("next", ".ui-menu-item:first", event);
+	},
+
+	previous: function(event) {
+		this.move("prev", ".ui-menu-item:last", event);
+	},
+
+	first: function() {
+		return this.active && !this.active.prevAll(".ui-menu-item").length;
+	},
+
+	last: function() {
+		return this.active && !this.active.nextAll(".ui-menu-item").length;
+	},
+
+	move: function(direction, edge, event) {
+		if (!this.active) {
+			this.activate(event, this.element.children(edge));
+			return;
+		}
+		var next = this.active[direction + "All"](".ui-menu-item").eq(0);
+		if (next.length) {
+			this.activate(event, next);
+		} else {
+			this.activate(event, this.element.children(edge));
+		}
+	},
+
+	// TODO merge with previousPage
+	nextPage: function(event) {
+		if (this.hasScroll()) {
+			// TODO merge with no-scroll-else
+			if (!this.active || this.last()) {
+				this.activate(event, this.element.children(".ui-menu-item:first"));
+				return;
+			}
+			var base = this.active.offset().top,
+				height = this.element.height(),
+				result = this.element.children(".ui-menu-item").filter(function() {
+					var close = $(this).offset().top - base - height + $(this).height();
+					// TODO improve approximation
+					return close < 10 && close > -10;
+				});
+
+			// TODO try to catch this earlier when scrollTop indicates the last page anyway
+			if (!result.length) {
+				result = this.element.children(".ui-menu-item:last");
+			}
+			this.activate(event, result);
+		} else {
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.last() ? ":first" : ":last"));
+		}
+	},
+
+	// TODO merge with nextPage
+	previousPage: function(event) {
+		if (this.hasScroll()) {
+			// TODO merge with no-scroll-else
+			if (!this.active || this.first()) {
+				this.activate(event, this.element.children(".ui-menu-item:last"));
+				return;
+			}
+
+			var base = this.active.offset().top,
+				height = this.element.height(),
+				result = this.element.children(".ui-menu-item").filter(function() {
+					var close = $(this).offset().top - base + height - $(this).height();
+					// TODO improve approximation
+					return close < 10 && close > -10;
+				});
+
+			// TODO try to catch this earlier when scrollTop indicates the last page anyway
+			if (!result.length) {
+				result = this.element.children(".ui-menu-item:first");
+			}
+			this.activate(event, result);
+		} else {
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.first() ? ":last" : ":first"));
+		}
+	},
+
+	hasScroll: function() {
+		return this.element.height() < this.element[ $.fn.prop ? "prop" : "attr" ]("scrollHeight");
+	},
+
+	select: function( event ) {
+		this._trigger("selected", event, { item: this.active });
+	}
+});
+
+}(jQuery));
+
+(function( $, undefined ) {
+
+var lastActive, startXPos, startYPos, clickDragged,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function() {
+		var buttons = $( this ).find( ":ui-button" );
+		setTimeout(function() {
+			buttons.button( "refresh" );
+		}, 1 );
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset.button" )
+			.bind( "reset.button", formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = !!this.element.propAttr( "disabled" );
+		} else {
+			this.element.propAttr( "disabled", this.options.disabled );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var self = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			hoverClass = "ui-state-hover" + ( !toggleButton ? " ui-state-active" : "" ),
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = this.buttonElement.html();
+		}
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( hoverClass );
+			})
+			.bind( "click.button", function( event ) {
+				if ( options.disabled ) {
+					event.preventDefault();
+					event.stopImmediatePropagation();
+				}
+			});
+
+		this.element
+			.bind( "focus.button", function() {
+				// no need to check disabled, focus won't be triggered anyway
+				self.buttonElement.addClass( focusClass );
+			})
+			.bind( "blur.button", function() {
+				self.buttonElement.removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change.button", function() {
+				if ( clickDragged ) {
+					return;
+				}
+				self.refresh();
+			});
+			// if mouse moves between mousedown and mouseup (drag) set clickDragged flag
+			// prevents issue where button state changes but checkbox/radio checked state
+			// does not in Firefox (see ticket #6970)
+			this.buttonElement
+				.bind( "mousedown.button", function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					clickDragged = false;
+					startXPos = event.pageX;
+					startYPos = event.pageY;
+				})
+				.bind( "mouseup.button", function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					if ( startXPos !== event.pageX || startYPos !== event.pageY ) {
+						clickDragged = true;
+					}
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+				$( this ).toggleClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", self.element[0].checked );
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", "true" );
+
+				var radio = self.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					$( document ).one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown.button", function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode == $.ui.keyCode.SPACE || event.keyCode == $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				.bind( "keyup.button", function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+		this._resetButton();
+	},
+
+	_determineButtonType: function() {
+
+		if ( this.element.is(":checkbox") ) {
+			this.type = "checkbox";
+		} else if ( this.element.is(":radio") ) {
+			this.type = "radio";
+		} else if ( this.element.is("input") ) {
+			this.type = "input";
+		} else {
+			this.type = "button";
+		}
+
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			var ancestor = this.element.parents().filter(":last"),
+				labelSelector = "label[for='" + this.element.attr("id") + "']";
+			this.buttonElement = ancestor.find( labelSelector );
+			if ( !this.buttonElement.length ) {
+				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+				this.buttonElement = ancestor.filter( labelSelector );
+				if ( !this.buttonElement.length ) {
+					this.buttonElement = ancestor.find( labelSelector );
+				}
+			}
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			var checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.attr( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.propAttr( "disabled", true );
+			} else {
+				this.element.propAttr( "disabled", false );
+			}
+			return;
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		var isDisabled = this.element.is( ":disabled" );
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", "true" );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", "false" );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", "true" );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>", this.element[0].ownerDocument )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];  
+
+		if ( icons.primary || icons.secondary ) {
+			if ( this.options.text ) {
+				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			}
+
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+
+			if ( !this.options.text ) {
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", buttonText );
+				}
+			}
+		} else {
+			buttonClasses.push( "ui-button-text-only" );
+		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
+	}
+});
+
+$.widget( "ui.buttonset", {
+	options: {
+		items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+	
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+	
+	refresh: function() {
+		var rtl = this.element.css( "direction" ) === "rtl";
+		
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+
+		$.Widget.prototype.destroy.call( this );
+	}
+});
+
+}( jQuery ) );
+
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.8.22" } });
+
+var PROP_NAME = 'datepicker';
+var dpuuid = new Date().getTime();
+var instActive;
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this.debug = false; // Change this to true to start debugging
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = 'ui-datepicker-div'; // The ID of the main datepicker division
+	this._inlineClass = 'ui-datepicker-inline'; // The name of the inline marker class
+	this._appendClass = 'ui-datepicker-append'; // The name of the append marker class
+	this._triggerClass = 'ui-datepicker-trigger'; // The name of the trigger marker class
+	this._dialogClass = 'ui-datepicker-dialog'; // The name of the dialog marker class
+	this._disableClass = 'ui-datepicker-disabled'; // The name of the disabled covering marker class
+	this._unselectableClass = 'ui-datepicker-unselectable'; // The name of the unselectable cell marker class
+	this._currentClass = 'ui-datepicker-current-day'; // The name of the current day marker class
+	this._dayOverClass = 'ui-datepicker-days-cell-over'; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		closeText: 'Done', // Display text for close link
+		prevText: 'Prev', // Display text for previous month link
+		nextText: 'Next', // Display text for next month link
+		currentText: 'Today', // Display text for current month link
+		monthNames: ['January','February','March','April','May','June',
+			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
+		weekHeader: 'Wk', // Column header for week of the year
+		dateFormat: 'mm/dd/yy', // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: '' // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: 'focus', // 'focus' for popup on focus,
+			// 'button' for trigger button, or 'both' for either
+		showAnim: 'fadeIn', // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: '', // Display text following the input box, e.g. showing the format
+		buttonText: '...', // Text for trigger button
+		buttonImage: '', // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: 'c-10:c+10', // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: '+10', // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with '+' for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: 'fast', // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: '', // Selector for an alternate field to store selected dates into
+		altFormat: '', // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend(this._defaults, this.regional['']);
+	this.dpDiv = bindHover($('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'));
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: 'hasDatepicker',
+	
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	/* Debug logging (if enabled). */
+	log: function () {
+		if (this.debug)
+			console.log.apply('', arguments);
+	},
+	
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span
+	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
+	_attachDatepicker: function(target, settings) {
+		// check for settings on the control itself - in namespace 'date:'
+		var inlineSettings = null;
+		for (var attrName in this._defaults) {
+			var attrValue = target.getAttribute('date:' + attrName);
+			if (attrValue) {
+				inlineSettings = inlineSettings || {};
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		var inline = (nodeName == 'div' || nodeName == 'span');
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = 'dp' + this.uuid;
+		}
+		var inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+		if (nodeName == 'input') {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			bindHover($('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName))
+			return;
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp).
+			bind("setData.datepicker", function(event, key, value) {
+				inst.settings[key] = value;
+			}).bind("getData.datepicker", function(event, key) {
+				return this._get(inst, key);
+			});
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var appendText = this._get(inst, 'appendText');
+		var isRTL = this._get(inst, 'isRTL');
+		if (inst.append)
+			inst.append.remove();
+		if (appendText) {
+			inst.append = $('<span class="' + this._appendClass + '">' + appendText + '</span>');
+			input[isRTL ? 'before' : 'after'](inst.append);
+		}
+		input.unbind('focus', this._showDatepicker);
+		if (inst.trigger)
+			inst.trigger.remove();
+		var showOn = this._get(inst, 'showOn');
+		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
+			var buttonText = this._get(inst, 'buttonText');
+			var buttonImage = this._get(inst, 'buttonImage');
+			inst.trigger = $(this._get(inst, 'buttonImageOnly') ?
+				$('<img/>').addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$('<button type="button"></button>').addClass(this._triggerClass).
+					html(buttonImage == '' ? buttonText : $('<img/>').attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? 'before' : 'after'](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == input[0])
+					$.datepicker._hideDatepicker();
+				else if ($.datepicker._datepickerShowing && $.datepicker._lastInput != input[0]) {
+					$.datepicker._hideDatepicker(); 
+					$.datepicker._showDatepicker(input[0]);
+				} else
+					$.datepicker._showDatepicker(input[0]);
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, 'autoSize') && !inst.inline) {
+			var date = new Date(2009, 12 - 1, 20); // Ensure double digits
+			var dateFormat = this._get(inst, 'dateFormat');
+			if (dateFormat.match(/[DM]/)) {
+				var findMax = function(names) {
+					var max = 0;
+					var maxI = 0;
+					for (var i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					'monthNames' : 'monthNamesShort'))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					'dayNames' : 'dayNamesShort'))) + 20 - date.getDay());
+			}
+			inst.input.attr('size', this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName))
+			return;
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv).
+			bind("setData.datepicker", function(event, key, value){
+				inst.settings[key] = value;
+			}).bind("getData.datepicker", function(event, key){
+				return this._get(inst, key);
+			});
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	   @param  input     element - ignored
+	   @param  date      string or Date - the initial date to display
+	   @param  onSelect  function - the function to call when a date is selected
+	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
+	                     event - with x/y coordinates or
+	                     leave empty for default (screen centre)
+	   @return the manager object */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var inst = this._dialogInst; // internal instance
+		if (!inst) {
+			this.uuid += 1;
+			var id = 'dp' + this.uuid;
+			this._dialogInput = $('<input type="text" id="' + id +
+				'" style="position: absolute; top: -100px; width: 0px;"/>');
+			this._dialogInput.keydown(this._doKeyDown);
+			$('body').append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor == Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			var browserWidth = document.documentElement.clientWidth;
+			var browserHeight = document.documentElement.clientHeight;
+			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css('left', (this._pos[0] + 20) + 'px').css('top', this._pos[1] + 'px');
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI)
+			$.blockUI(this.dpDiv);
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	   @param  target    element - the target input field or division or span */
+	_destroyDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName == 'input') {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind('focus', this._showDatepicker).
+				unbind('keydown', this._doKeyDown).
+				unbind('keypress', this._doKeyPress).
+				unbind('keyup', this._doKeyUp);
+		} else if (nodeName == 'div' || nodeName == 'span')
+			$target.removeClass(this.markerClassName).empty();
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_enableDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		if (nodeName == 'input') {
+			target.disabled = false;
+			inst.trigger.filter('button').
+				each(function() { this.disabled = false; }).end().
+				filter('img').css({opacity: '1.0', cursor: ''});
+		}
+		else if (nodeName == 'div' || nodeName == 'span') {
+			var inline = $target.children('.' + this._inlineClass);
+			inline.children().removeClass('ui-state-disabled');
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				removeAttr("disabled");
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_disableDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		if (nodeName == 'input') {
+			target.disabled = true;
+			inst.trigger.filter('button').
+				each(function() { this.disabled = true; }).end().
+				filter('img').css({opacity: '0.5', cursor: 'default'});
+		}
+		else if (nodeName == 'div' || nodeName == 'span') {
+			var inline = $target.children('.' + this._inlineClass);
+			inline.children().addClass('ui-state-disabled');
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				attr("disabled", "disabled");
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	   @param  target    element - the target input field or division or span
+	   @return boolean - true if disabled, false if enabled */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] == target)
+				return true;
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	   @param  target  element - the target input field or division or span
+	   @return  object - the associated instance data
+	   @throws  error if a jQuery problem getting data */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw 'Missing instance data for this datepicker';
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span
+	   @param  name    object - the new settings to update or
+	                   string - the name of the setting to change or retrieve,
+	                   when retrieving also 'all' for all instance settings or
+	                   'defaults' for all global defaults
+	   @param  value   any - the new value for the setting
+	                   (omit if above is an object or to retrieve a value) */
+	_optionDatepicker: function(target, name, value) {
+		var inst = this._getInst(target);
+		if (arguments.length == 2 && typeof name == 'string') {
+			return (name == 'defaults' ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name == 'all' ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+		var settings = name || {};
+		if (typeof name == 'string') {
+			settings = {};
+			settings[name] = value;
+		}
+		if (inst) {
+			if (this._curInst == inst) {
+				this._hideDatepicker();
+			}
+			var date = this._getDateDatepicker(target, true);
+			var minDate = this._getMinMaxDate(inst, 'min');
+			var maxDate = this._getMinMaxDate(inst, 'max');
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings['dateFormat'] !== undefined && settings['minDate'] === undefined)
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			if (maxDate !== null && settings['dateFormat'] !== undefined && settings['maxDate'] === undefined)
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	   @param  target   element - the target input field or division or span
+	   @param  date     Date - the new date */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	   @param  target     element - the target input field or division or span
+	   @param  noDefault  boolean - true if no default date is to be used
+	   @return Date - the current date */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline)
+			this._setDateFromField(inst, noDefault);
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		var handled = true;
+		var isRTL = inst.dpDiv.is('.ui-datepicker-rtl');
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing)
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: var sel = $('td.' + $.datepicker._dayOverClass + ':not(.' + 
+									$.datepicker._currentClass + ')', inst.dpDiv);
+						if (sel[0])
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+							var onSelect = $.datepicker._get(inst, 'onSelect');
+							if (onSelect) {
+								var dateStr = $.datepicker._formatDate(inst);
+
+								// trigger custom callback
+								onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+							}
+						else
+							$.datepicker._hideDatepicker();
+						return false; // don't submit the form
+						break; // select the value on enter
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, 'stepBigMonths') :
+							-$.datepicker._get(inst, 'stepMonths')), 'M');
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, 'stepBigMonths') :
+							+$.datepicker._get(inst, 'stepMonths')), 'M');
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) $.datepicker._clearDate(event.target);
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) $.datepicker._gotoToday(event.target);
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), 'D');
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+									-$.datepicker._get(inst, 'stepBigMonths') :
+									-$.datepicker._get(inst, 'stepMonths')), 'M');
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, -7, 'D');
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), 'D');
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+									+$.datepicker._get(inst, 'stepBigMonths') :
+									+$.datepicker._get(inst, 'stepMonths')), 'M');
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, +7, 'D');
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		else if (event.keyCode == 36 && event.ctrlKey) // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		else {
+			handled = false;
+		}
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
+			var chr = String.fromCharCode(event.charCode == undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		if (inst.input.val() != inst.lastVal) {
+			try {
+				var date = $.datepicker.parseDate($.datepicker._get(inst, 'dateFormat'),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+				$.datepicker.log(err);
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+       If false returned from beforeShow event handler do not show. 
+	   @param  input  element - the input field attached to the date picker or
+	                  event - if triggered by focus */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
+			input = $('input', input.parentNode)[0];
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
+			return;
+		var inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst != inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+		var beforeShow = $.datepicker._get(inst, 'beforeShow');
+		var beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+            //false
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+		if ($.datepicker._inDialog) // hide cursor
+			input.value = '';
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+		var isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css('position') == 'fixed';
+			return !isFixed;
+		});
+		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
+			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
+			$.datepicker._pos[1] -= document.documentElement.scrollTop;
+		}
+		var offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: 'absolute', display: 'block', top: '-1000px'});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
+			left: offset.left + 'px', top: offset.top + 'px'});
+		if (!inst.inline) {
+			var showAnim = $.datepicker._get(inst, 'showAnim');
+			var duration = $.datepicker._get(inst, 'duration');
+			var postProcess = function() {
+				var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+				if( !! cover.length ){
+					var borders = $.datepicker._getBorders(inst.dpDiv);
+					cover.css({left: -borders[0], top: -borders[1],
+						width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()});
+				}
+			};
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+			if ($.effects && $.effects[showAnim])
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
+			else
+				inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
+			if (!showAnim || !duration)
+				postProcess();
+			if (inst.input.is(':visible') && !inst.input.is(':disabled'))
+				inst.input.focus();
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		var self = this;
+		self.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		var borders = $.datepicker._getBorders(inst.dpDiv);
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+		if( !!cover.length ){ //avoid call to outerXXXX() when not in IE6
+			cover.css({left: -borders[0], top: -borders[1], width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()})
+		}
+		inst.dpDiv.find('.' + this._dayOverClass + ' a').mouseover();
+		var numMonths = this._getNumberOfMonths(inst);
+		var cols = numMonths[1];
+		var width = 17;
+		inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
+		if (cols > 1)
+			inst.dpDiv.addClass('ui-datepicker-multi-' + cols).css('width', (width * cols) + 'em');
+		inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
+			'Class']('ui-datepicker-multi');
+		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
+			'Class']('ui-datepicker-rtl');
+		if (inst == $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
+				// #6694 - don't focus the input if it's already focused
+				// this breaks the change event in IE
+				inst.input.is(':visible') && !inst.input.is(':disabled') && inst.input[0] != document.activeElement)
+			inst.input.focus();
+		// deffered render of the years select (to avoid flashes on Firefox) 
+		if( inst.yearshtml ){
+			var origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find('select.ui-datepicker-year:first').replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	/* Retrieve the size of left and top borders for an element.
+	   @param  elem  (jQuery object) the element of interest
+	   @return  (number[2]) the left and top borders */
+	_getBorders: function(elem) {
+		var convert = function(value) {
+			return {thin: 1, medium: 2, thick: 3}[value] || value;
+		};
+		return [parseFloat(convert(elem.css('border-left-width'))),
+			parseFloat(convert(elem.css('border-top-width')))];
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth();
+		var dpHeight = inst.dpDiv.outerHeight();
+		var inputWidth = inst.input ? inst.input.outerWidth() : 0;
+		var inputHeight = inst.input ? inst.input.outerHeight() : 0;
+		var viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft());
+		var viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, 'isRTL') ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var inst = this._getInst(obj);
+		var isRTL = this._get(inst, 'isRTL');
+        while (obj && (obj.type == 'hidden' || obj.nodeType != 1 || $.expr.filters.hidden(obj))) {
+            obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
+        }
+        var position = $(obj).offset();
+	    return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	   @param  input  element - the input field attached to the date picker */
+	_hideDatepicker: function(input) {
+		var inst = this._curInst;
+		if (!inst || (input && inst != $.data(input, PROP_NAME)))
+			return;
+		if (this._datepickerShowing) {
+			var showAnim = this._get(inst, 'showAnim');
+			var duration = this._get(inst, 'duration');
+			var postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+			if ($.effects && $.effects[showAnim])
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
+			else
+				inst.dpDiv[(showAnim == 'slideDown' ? 'slideUp' :
+					(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
+			if (!showAnim)
+				postProcess();
+			this._datepickerShowing = false;
+			var onClose = this._get(inst, 'onClose');
+			if (onClose)
+				onClose.apply((inst.input ? inst.input[0] : null),
+					[(inst.input ? inst.input.val() : ''), inst]);
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
+				if ($.blockUI) {
+					$.unblockUI();
+					$('body').append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind('.ui-datepicker-calendar');
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst)
+			return;
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id != $.datepicker._mainDivId &&
+				$target.parents('#' + $.datepicker._mainDivId).length == 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst != inst ) )
+			$.datepicker._hideDatepicker();
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period == 'M' ? this._get(inst, 'showCurrentAtPos') : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (this._get(inst, 'gotoCurrent') && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		}
+		else {
+			var date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		inst['selected' + (period == 'M' ? 'Month' : 'Year')] =
+		inst['draw' + (period == 'M' ? 'Month' : 'Year')] =
+			parseInt(select.options[select.selectedIndex].value,10);
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var target = $(id);
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		var inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $('a', td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		this._selectDate(target, '');
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input)
+			inst.input.val(dateStr);
+		this._updateAlternate(inst);
+		var onSelect = this._get(inst, 'onSelect');
+		if (onSelect)
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		else if (inst.input)
+			inst.input.trigger('change'); // fire the change event
+		if (inst.inline)
+			this._updateDatepicker(inst);
+		else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) != 'object')
+				inst.input.focus(); // restore focus
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altField = this._get(inst, 'altField');
+		if (altField) { // update alternate field too
+			var altFormat = this._get(inst, 'altFormat') || this._get(inst, 'dateFormat');
+			var date = this._getDate(inst);
+			var dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	   @param  date  Date - the date to customise
+	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ''];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	   @param  date  Date - the date to get the week for
+	   @return  number - the number of the week within the year that contains this date */
+	iso8601Week: function(date) {
+		var checkDate = new Date(date.getTime());
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+		var time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	   See formatDate below for the possible formats.
+
+	   @param  format    string - the expected format of the date
+	   @param  value     string - the date in the above format
+	   @param  settings  Object - attributes include:
+	                     shortYearCutoff  number - the cutoff year for determining the century (optional)
+	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         string[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
+	                     monthNames       string[12] - names of the months (optional)
+	   @return  Date - the extracted date value or null if value is blank */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null)
+			throw 'Invalid arguments';
+		value = (typeof value == 'object' ? value.toString() : value + '');
+		if (value == '')
+			return null;
+		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		var year = -1;
+		var month = -1;
+		var day = -1;
+		var doy = -1;
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		// Extract a number from the string value
+		var getNumber = function(match) {
+			var isDoubled = lookAhead(match);
+			var size = (match == '@' ? 14 : (match == '!' ? 20 :
+				(match == 'y' && isDoubled ? 4 : (match == 'o' ? 3 : 2))));
+			var digits = new RegExp('^\\d{1,' + size + '}');
+			var num = value.substring(iValue).match(digits);
+			if (!num)
+				throw 'Missing number at position ' + iValue;
+			iValue += num[0].length;
+			return parseInt(num[0], 10);
+		};
+		// Extract a name from the string value and convert to an index
+		var getName = function(match, shortNames, longNames) {
+			var names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+				return [ [k, v] ];
+			}).sort(function (a, b) {
+				return -(a[1].length - b[1].length);
+			});
+			var index = -1;
+			$.each(names, function (i, pair) {
+				var name = pair[1];
+				if (value.substr(iValue, name.length).toLowerCase() == name.toLowerCase()) {
+					index = pair[0];
+					iValue += name.length;
+					return false;
+				}
+			});
+			if (index != -1)
+				return index + 1;
+			else
+				throw 'Unknown name at position ' + iValue;
+		};
+		// Confirm that a literal character matches the string value
+		var checkLiteral = function() {
+			if (value.charAt(iValue) != format.charAt(iFormat))
+				throw 'Unexpected literal at position ' + iValue;
+			iValue++;
+		};
+		var iValue = 0;
+		for (var iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					checkLiteral();
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd':
+						day = getNumber('d');
+						break;
+					case 'D':
+						getName('D', dayNamesShort, dayNames);
+						break;
+					case 'o':
+						doy = getNumber('o');
+						break;
+					case 'm':
+						month = getNumber('m');
+						break;
+					case 'M':
+						month = getName('M', monthNamesShort, monthNames);
+						break;
+					case 'y':
+						year = getNumber('y');
+						break;
+					case '@':
+						var date = new Date(getNumber('@'));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case '!':
+						var date = new Date((getNumber('!') - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'"))
+							checkLiteral();
+						else
+							literal = true;
+						break;
+					default:
+						checkLiteral();
+				}
+		}
+		if (iValue < value.length){
+			throw "Extra/unparsed characters found in date: " + value.substring(iValue);
+		}
+		if (year == -1)
+			year = new Date().getFullYear();
+		else if (year < 100)
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				var dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim)
+					break;
+				month++;
+				day -= dim;
+			} while (true);
+		}
+		var date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
+			throw 'Invalid date'; // E.g. 31/02/00
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: 'yy-mm-dd', // RFC 3339 (ISO 8601)
+	COOKIE: 'D, dd M yy',
+	ISO_8601: 'yy-mm-dd',
+	RFC_822: 'D, d M y',
+	RFC_850: 'DD, dd-M-y',
+	RFC_1036: 'D, d M y',
+	RFC_1123: 'D, d M yy',
+	RFC_2822: 'D, d M yy',
+	RSS: 'D, d M y', // RFC 822
+	TICKS: '!',
+	TIMESTAMP: '@',
+	W3C: 'yy-mm-dd', // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	   The format can be combinations of the following:
+	   d  - day of month (no leading zero)
+	   dd - day of month (two digit)
+	   o  - day of year (no leading zeros)
+	   oo - day of year (three digit)
+	   D  - day name short
+	   DD - day name long
+	   m  - month of year (no leading zero)
+	   mm - month of year (two digit)
+	   M  - month name short
+	   MM - month name long
+	   y  - year (two digit)
+	   yy - year (four digit)
+	   @ - Unix timestamp (ms since 01/01/1970)
+	   ! - Windows ticks (100ns since 01/01/0001)
+	   '...' - literal text
+	   '' - single quote
+
+	   @param  format    string - the desired format of the date
+	   @param  date      Date - the date value to format
+	   @param  settings  Object - attributes include:
+	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         string[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
+	                     monthNames       string[12] - names of the months (optional)
+	   @return  string - the date in the above format */
+	formatDate: function (format, date, settings) {
+		if (!date)
+			return '';
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		// Format a number, with leading zero if necessary
+		var formatNumber = function(match, value, len) {
+			var num = '' + value;
+			if (lookAhead(match))
+				while (num.length < len)
+					num = '0' + num;
+			return num;
+		};
+		// Format a name, short or long as requested
+		var formatName = function(match, value, shortNames, longNames) {
+			return (lookAhead(match) ? longNames[value] : shortNames[value]);
+		};
+		var output = '';
+		var literal = false;
+		if (date)
+			for (var iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal)
+					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+						literal = false;
+					else
+						output += format.charAt(iFormat);
+				else
+					switch (format.charAt(iFormat)) {
+						case 'd':
+							output += formatNumber('d', date.getDate(), 2);
+							break;
+						case 'D':
+							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
+							break;
+						case 'o':
+							output += formatNumber('o',
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case 'm':
+							output += formatNumber('m', date.getMonth() + 1, 2);
+							break;
+						case 'M':
+							output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case 'y':
+							output += (lookAhead('y') ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
+							break;
+						case '@':
+							output += date.getTime();
+							break;
+						case '!':
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'"))
+								output += "'";
+							else
+								literal = true;
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+			}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var chars = '';
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		for (var iFormat = 0; iFormat < format.length; iFormat++)
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					chars += format.charAt(iFormat);
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd': case 'm': case 'y': case '@':
+						chars += '0123456789';
+						break;
+					case 'D': case 'M':
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'"))
+							chars += "'";
+						else
+							literal = true;
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() == inst.lastVal) {
+			return;
+		}
+		var dateFormat = this._get(inst, 'dateFormat');
+		var dates = inst.lastVal = inst.input ? inst.input.val() : null;
+		var date, defaultDate;
+		date = defaultDate = this._getDefaultDate(inst);
+		var settings = this._getFormatConfig(inst);
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			this.log(event);
+			dates = (noDefault ? '' : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, 'defaultDate'), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+			var date = new Date();
+			date.setDate(date.getDate() + offset);
+			return date;
+		};
+		var offsetString = function(offset) {
+			try {
+				return $.datepicker.parseDate($.datepicker._get(inst, 'dateFormat'),
+					offset, $.datepicker._getFormatConfig(inst));
+			}
+			catch (e) {
+				// Ignore
+			}
+			var date = (offset.toLowerCase().match(/^c/) ?
+				$.datepicker._getDate(inst) : null) || new Date();
+			var year = date.getFullYear();
+			var month = date.getMonth();
+			var day = date.getDate();
+			var pattern = /([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;
+			var matches = pattern.exec(offset);
+			while (matches) {
+				switch (matches[2] || 'd') {
+					case 'd' : case 'D' :
+						day += parseInt(matches[1],10); break;
+					case 'w' : case 'W' :
+						day += parseInt(matches[1],10) * 7; break;
+					case 'm' : case 'M' :
+						month += parseInt(matches[1],10);
+						day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+						break;
+					case 'y': case 'Y' :
+						year += parseInt(matches[1],10);
+						day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+						break;
+				}
+				matches = pattern.exec(offset);
+			}
+			return new Date(year, month, day);
+		};
+		var newDate = (date == null || date === '' ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+			(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+		newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	   Hours may be non-zero on daylight saving cut-over:
+	   > 12 when midnight changeover, but then cannot generate
+	   midnight datetime, so jump to 1AM, otherwise reset.
+	   @param  date  (Date) the date to check
+	   @return  (Date) the corrected date */
+	_daylightSavingAdjust: function(date) {
+		if (!date) return null;
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date;
+		var origMonth = inst.selectedMonth;
+		var origYear = inst.selectedYear;
+		var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth != inst.selectedMonth || origYear != inst.selectedYear) && !noChange)
+			this._notifyChange(inst);
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? '' : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() == '') ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, 'stepMonths');
+		var id = '#' + inst.id;
+		inst.dpDiv.find('[data-handler]').map(function () {
+			var handler = {
+				prev: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._adjustDate(id, -stepMonths, 'M');
+				},
+				next: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._adjustDate(id, +stepMonths, 'M');
+				},
+				hide: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._hideDatepicker();
+				},
+				today: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._selectDay(id, +this.getAttribute('data-month'), +this.getAttribute('data-year'), this);
+					return false;
+				},
+				selectMonth: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._selectMonthYear(id, this, 'M');
+					return false;
+				},
+				selectYear: function () {
+					window['DP_jQuery_' + dpuuid].datepicker._selectMonthYear(id, this, 'Y');
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute('data-event'), handler[this.getAttribute('data-handler')]);
+		});
+	},
+	
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var today = new Date();
+		today = this._daylightSavingAdjust(
+			new Date(today.getFullYear(), today.getMonth(), today.getDate())); // clear time
+		var isRTL = this._get(inst, 'isRTL');
+		var showButtonPanel = this._get(inst, 'showButtonPanel');
+		var hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext');
+		var navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat');
+		var numMonths = this._getNumberOfMonths(inst);
+		var showCurrentAtPos = this._get(inst, 'showCurrentAtPos');
+		var stepMonths = this._get(inst, 'stepMonths');
+		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
+		var currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+			new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		var drawMonth = inst.drawMonth - showCurrentAtPos;
+		var drawYear = inst.drawYear;
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			var maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+		var prevText = this._get(inst, 'prevText');
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+		var prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			'<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click"' +
+			' title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>' :
+			(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+ prevText +'"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>'));
+		var nextText = this._get(inst, 'nextText');
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+		var next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			'<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click"' +
+			' title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>' :
+			(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+ nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>'));
+		var currentText = this._get(inst, 'currentText');
+		var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+		var controls = (!inst.inline ? '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" data-handler="hide" data-event="click">' +
+			this._get(inst, 'closeText') + '</button>' : '');
+		var buttonPanel = (showButtonPanel) ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
+			(this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click"' +
+			'>' + currentText + '</button>' : '') + (isRTL ? '' : controls) + '</div>' : '';
+		var firstDay = parseInt(this._get(inst, 'firstDay'),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+		var showWeek = this._get(inst, 'showWeek');
+		var dayNames = this._get(inst, 'dayNames');
+		var dayNamesShort = this._get(inst, 'dayNamesShort');
+		var dayNamesMin = this._get(inst, 'dayNamesMin');
+		var monthNames = this._get(inst, 'monthNames');
+		var monthNamesShort = this._get(inst, 'monthNamesShort');
+		var beforeShowDay = this._get(inst, 'beforeShowDay');
+		var showOtherMonths = this._get(inst, 'showOtherMonths');
+		var selectOtherMonths = this._get(inst, 'selectOtherMonths');
+		var calculateWeek = this._get(inst, 'calculateWeek') || this.iso8601Week;
+		var defaultDate = this._getDefaultDate(inst);
+		var html = '';
+		for (var row = 0; row < numMonths[0]; row++) {
+			var group = '';
+			this.maxRows = 4;
+			for (var col = 0; col < numMonths[1]; col++) {
+				var selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				var cornerClass = ' ui-corner-all';
+				var calender = '';
+				if (isMultiMonth) {
+					calender += '<div class="ui-datepicker-group';
+					if (numMonths[1] > 1)
+						switch (col) {
+							case 0: calender += ' ui-datepicker-group-first';
+								cornerClass = ' ui-corner-' + (isRTL ? 'right' : 'left'); break;
+							case numMonths[1]-1: calender += ' ui-datepicker-group-last';
+								cornerClass = ' ui-corner-' + (isRTL ? 'left' : 'right'); break;
+							default: calender += ' ui-datepicker-group-middle'; cornerClass = ''; break;
+						}
+					calender += '">';
+				}
+				calender += '<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
+					(/all|left/.test(cornerClass) && row == 0 ? (isRTL ? next : prev) : '') +
+					(/all|right/.test(cornerClass) && row == 0 ? (isRTL ? prev : next) : '') +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					'</div><table class="ui-datepicker-calendar"><thead>' +
+					'<tr>';
+				var thead = (showWeek ? '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '');
+				for (var dow = 0; dow < 7; dow++) { // days of the week
+					var day = (dow + firstDay) % 7;
+					thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
+						'<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
+				}
+				calender += thead + '</tr></thead><tbody>';
+				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				var curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				var numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += '<tr>';
+					var tbody = (!showWeek ? '' : '<td class="ui-datepicker-week-col">' +
+						this._get(inst, 'calculateWeek')(printDate) + '</td>');
+					for (var dow = 0; dow < 7; dow++) { // create date picker days
+						var daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']);
+						var otherMonth = (printDate.getMonth() != drawMonth);
+						var unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += '<td class="' +
+							((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
+							(otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
+							((printDate.getTime() == selectedDate.getTime() && drawMonth == inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() == printDate.getTime() && defaultDate.getTime() == selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							' ' + this._dayOverClass : '') + // highlight selected day
+							(unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled': '') +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
+							(printDate.getTime() == currentDate.getTime() ? ' ' + this._currentClass : '') + // highlight selected day
+							(printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
+							(unselectable ? '' : ' data-handler="selectDay" data-event="click" data-month="' + printDate.getMonth() + '" data-year="' + printDate.getFullYear() + '"') + '>' + // actions
+							(otherMonth && !showOtherMonths ? '&#xa0;' : // display for other months
+							(unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>' : '<a class="ui-state-default' +
+							(printDate.getTime() == today.getTime() ? ' ui-state-highlight' : '') +
+							(printDate.getTime() == currentDate.getTime() ? ' ui-state-active' : '') + // highlight selected day
+							(otherMonth ? ' ui-priority-secondary' : '') + // distinguish dates from other months
+							'" href="#">' + printDate.getDate() + '</a>')) + '</td>'; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + '</tr>';
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += '</tbody></table>' + (isMultiMonth ? '</div>' + 
+							((numMonths[0] > 0 && col == numMonths[1]-1) ? '<div class="ui-datepicker-row-break"></div>' : '') : '');
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel + ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+			'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+		var changeMonth = this._get(inst, 'changeMonth');
+		var changeYear = this._get(inst, 'changeYear');
+		var showMonthAfterYear = this._get(inst, 'showMonthAfterYear');
+		var html = '<div class="ui-datepicker-title">';
+		var monthHtml = '';
+		// month selection
+		if (secondary || !changeMonth)
+			monthHtml += '<span class="ui-datepicker-month">' + monthNames[drawMonth] + '</span>';
+		else {
+			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
+			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
+			monthHtml += '<select class="ui-datepicker-month" data-handler="selectMonth" data-event="change">';
+			for (var month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) &&
+						(!inMaxYear || month <= maxDate.getMonth()))
+					monthHtml += '<option value="' + month + '"' +
+						(month == drawMonth ? ' selected="selected"' : '') +
+						'>' + monthNamesShort[month] + '</option>';
+			}
+			monthHtml += '</select>';
+		}
+		if (!showMonthAfterYear)
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '');
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = '';
+			if (secondary || !changeYear)
+				html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
+			else {
+				// determine range of years to display
+				var years = this._get(inst, 'yearRange').split(':');
+				var thisYear = new Date().getFullYear();
+				var determineYear = function(value) {
+					var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				var year = determineYear(years[0]);
+				var endYear = Math.max(year, determineYear(years[1] || ''));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += '<select class="ui-datepicker-year" data-handler="selectYear" data-event="change">';
+				for (; year <= endYear; year++) {
+					inst.yearshtml += '<option value="' + year + '"' +
+						(year == drawYear ? ' selected="selected"' : '') +
+						'>' + year + '</option>';
+				}
+				inst.yearshtml += '</select>';
+				
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+		html += this._get(inst, 'yearSuffix');
+		if (showMonthAfterYear)
+			html += (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '') + monthHtml;
+		html += '</div>'; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period == 'Y' ? offset : 0);
+		var month = inst.drawMonth + (period == 'M' ? offset : 0);
+		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
+			(period == 'D' ? offset : 0);
+		var date = this._restrictMinMax(inst,
+			this._daylightSavingAdjust(new Date(year, month, day)));
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period == 'M' || period == 'Y')
+			this._notifyChange(inst);
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		var newDate = (minDate && date < minDate ? minDate : date);
+		newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
+		return newDate;
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, 'onChangeMonthYear');
+		if (onChange)
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, 'numberOfMonths');
+		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + 'Date'), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst);
+		var date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+		if (offset < 0)
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
+			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day == 'object' ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */ 
+function bindHover(dpDiv) {
+	var selector = 'button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a';
+	return dpDiv.bind('mouseout', function(event) {
+			var elem = $( event.target ).closest( selector );
+			if ( !elem.length ) {
+				return;
+			}
+			elem.removeClass( "ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover" );
+		})
+		.bind('mouseover', function(event) {
+			var elem = $( event.target ).closest( selector );
+			if ($.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0]) ||
+					!elem.length ) {
+				return;
+			}
+			elem.parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
+			elem.addClass('ui-state-hover');
+			if (elem.hasClass('ui-datepicker-prev')) elem.addClass('ui-datepicker-prev-hover');
+			if (elem.hasClass('ui-datepicker-next')) elem.addClass('ui-datepicker-next-hover');
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props)
+		if (props[name] == null || props[name] == undefined)
+			target[name] = props[name];
+	return target;
+};
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && (($.browser.safari && typeof a == 'object' && a.length) ||
+		(a.constructor && a.constructor.toString().match(/\Array\(\)/))));
+};
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+                    Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+	
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+	
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick).
+			find('body').append($.datepicker.dpDiv);
+		$.datepicker.initialized = true;
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate' || options == 'widget'))
+		return $.datepicker['_' + options + 'Datepicker'].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
+		return $.datepicker['_' + options + 'Datepicker'].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	return this.each(function() {
+		typeof options == 'string' ?
+			$.datepicker['_' + options + 'Datepicker'].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.8.22";
+
+// Workaround for #4055
+// Add another global to avoid noConflict issues with inline event handlers
+window['DP_jQuery_' + dpuuid] = $;
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+var uiDialogClasses =
+		'ui-dialog ' +
+		'ui-widget ' +
+		'ui-widget-content ' +
+		'ui-corner-all ',
+	sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	},
+	// support for jQuery 1.3.2 - handle common attrFn methods for dialog
+	attrFn = $.attrFn || {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true,
+		click: true
+	};
+
+$.widget("ui.dialog", {
+	options: {
+		autoOpen: true,
+		buttons: {},
+		closeOnEscape: true,
+		closeText: 'close',
+		dialogClass: '',
+		draggable: true,
+		hide: null,
+		height: 'auto',
+		maxHeight: false,
+		maxWidth: false,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: 'center',
+			at: 'center',
+			collision: 'fit',
+			// ensure that the titlebar is never outside the document
+			using: function(pos) {
+				var topOffset = $(this).css(pos).offset().top;
+				if (topOffset < 0) {
+					$(this).css('top', pos.top - topOffset);
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		stack: true,
+		title: '',
+		width: 300,
+		zIndex: 1000
+	},
+
+	_create: function() {
+		this.originalTitle = this.element.attr('title');
+		// #5742 - .attr() might return a DOMElement
+		if ( typeof this.originalTitle !== "string" ) {
+			this.originalTitle = "";
+		}
+
+		this.options.title = this.options.title || this.originalTitle;
+		var self = this,
+			options = self.options,
+
+			title = options.title || '&#160;',
+			titleId = $.ui.dialog.getTitleId(self.element),
+
+			uiDialog = (self.uiDialog = $('<div></div>'))
+				.appendTo(document.body)
+				.hide()
+				.addClass(uiDialogClasses + options.dialogClass)
+				.css({
+					zIndex: options.zIndex
+				})
+				// setting tabIndex makes the div focusable
+				// setting outline to 0 prevents a border on focus in Mozilla
+				.attr('tabIndex', -1).css('outline', 0).keydown(function(event) {
+					if (options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE) {
+						
+						self.close(event);
+						event.preventDefault();
+					}
+				})
+				.attr({
+					role: 'dialog',
+					'aria-labelledby': titleId
+				})
+				.mousedown(function(event) {
+					self.moveToTop(false, event);
+				}),
+
+			uiDialogContent = self.element
+				.show()
+				.removeAttr('title')
+				.addClass(
+					'ui-dialog-content ' +
+					'ui-widget-content')
+				.appendTo(uiDialog),
+
+			uiDialogTitlebar = (self.uiDialogTitlebar = $('<div></div>'))
+				.addClass(
+					'ui-dialog-titlebar ' +
+					'ui-widget-header ' +
+					'ui-corner-all ' +
+					'ui-helper-clearfix'
+				)
+				.prependTo(uiDialog),
+
+			uiDialogTitlebarClose = $('<a href="#"></a>')
+				.addClass(
+					'ui-dialog-titlebar-close ' +
+					'ui-corner-all'
+				)
+				.attr('role', 'button')
+				.hover(
+					function() {
+						uiDialogTitlebarClose.addClass('ui-state-hover');
+					},
+					function() {
+						uiDialogTitlebarClose.removeClass('ui-state-hover');
+					}
+				)
+				.focus(function() {
+					uiDialogTitlebarClose.addClass('ui-state-focus');
+				})
+				.blur(function() {
+					uiDialogTitlebarClose.removeClass('ui-state-focus');
+				})
+				.click(function(event) {
+					self.close(event);
+					return false;
+				})
+				.appendTo(uiDialogTitlebar),
+
+			uiDialogTitlebarCloseText = (self.uiDialogTitlebarCloseText = $('<span></span>'))
+				.addClass(
+					'ui-icon ' +
+					'ui-icon-closethick'
+				)
+				.text(options.closeText)
+				.appendTo(uiDialogTitlebarClose),
+
+			uiDialogTitle = $('<span></span>')
+				.addClass('ui-dialog-title')
+				.attr('id', titleId)
+				.html(title)
+				.prependTo(uiDialogTitlebar);
+
+		//handling of deprecated beforeclose (vs beforeClose) option
+		//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+		//TODO: remove in 1.9pre
+		if ($.isFunction(options.beforeclose) && !$.isFunction(options.beforeClose)) {
+			options.beforeClose = options.beforeclose;
+		}
+
+		uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection();
+
+		if (options.draggable && $.fn.draggable) {
+			self._makeDraggable();
+		}
+		if (options.resizable && $.fn.resizable) {
+			self._makeResizable();
+		}
+
+		self._createButtons(options.buttons);
+		self._isOpen = false;
+
+		if ($.fn.bgiframe) {
+			uiDialog.bgiframe();
+		}
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	destroy: function() {
+		var self = this;
+		
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.hide();
+		self.element
+			.unbind('.dialog')
+			.removeData('dialog')
+			.removeClass('ui-dialog-content ui-widget-content')
+			.hide().appendTo('body');
+		self.uiDialog.remove();
+
+		if (self.originalTitle) {
+			self.element.attr('title', self.originalTitle);
+		}
+
+		return self;
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	close: function(event) {
+		var self = this,
+			maxZ, thisZ;
+		
+		if (false === self._trigger('beforeClose', event)) {
+			return;
+		}
+
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.unbind('keypress.ui-dialog');
+
+		self._isOpen = false;
+
+		if (self.options.hide) {
+			self.uiDialog.hide(self.options.hide, function() {
+				self._trigger('close', event);
+			});
+		} else {
+			self.uiDialog.hide();
+			self._trigger('close', event);
+		}
+
+		$.ui.dialog.overlay.resize();
+
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		if (self.options.modal) {
+			maxZ = 0;
+			$('.ui-dialog').each(function() {
+				if (this !== self.uiDialog[0]) {
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
+				}
+			});
+			$.ui.dialog.maxZ = maxZ;
+		}
+
+		return self;
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	// the force parameter allows us to move modal dialogs to their correct
+	// position on open
+	moveToTop: function(force, event) {
+		var self = this,
+			options = self.options,
+			saveScroll;
+
+		if ((options.modal && !force) ||
+			(!options.stack && !options.modal)) {
+			return self._trigger('focus', event);
+		}
+
+		if (options.zIndex > $.ui.dialog.maxZ) {
+			$.ui.dialog.maxZ = options.zIndex;
+		}
+		if (self.overlay) {
+			$.ui.dialog.maxZ += 1;
+			self.overlay.$el.css('z-index', $.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ);
+		}
+
+		//Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
+		//  http://ui.jquery.com/bugs/ticket/3193
+		saveScroll = { scrollTop: self.element.scrollTop(), scrollLeft: self.element.scrollLeft() };
+		$.ui.dialog.maxZ += 1;
+		self.uiDialog.css('z-index', $.ui.dialog.maxZ);
+		self.element.attr(saveScroll);
+		self._trigger('focus', event);
+
+		return self;
+	},
+
+	open: function() {
+		if (this._isOpen) { return; }
+
+		var self = this,
+			options = self.options,
+			uiDialog = self.uiDialog;
+
+		self.overlay = options.modal ? new $.ui.dialog.overlay(self) : null;
+		self._size();
+		self._position(options.position);
+		uiDialog.show(options.show);
+		self.moveToTop(true);
+
+		// prevent tabbing out of modal dialogs
+		if ( options.modal ) {
+			uiDialog.bind( "keydown.ui-dialog", function( event ) {
+				if ( event.keyCode !== $.ui.keyCode.TAB ) {
+					return;
+				}
+
+				var tabbables = $(':tabbable', this),
+					first = tabbables.filter(':first'),
+					last  = tabbables.filter(':last');
+
+				if (event.target === last[0] && !event.shiftKey) {
+					first.focus(1);
+					return false;
+				} else if (event.target === first[0] && event.shiftKey) {
+					last.focus(1);
+					return false;
+				}
+			});
+		}
+
+		// set focus to the first tabbable element in the content area or the first button
+		// if there are no tabbable elements, set focus on the dialog itself
+		$(self.element.find(':tabbable').get().concat(
+			uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+				uiDialog.get()))).eq(0).focus();
+
+		self._isOpen = true;
+		self._trigger('open');
+
+		return self;
+	},
+
+	_createButtons: function(buttons) {
+		var self = this,
+			hasButtons = false,
+			uiDialogButtonPane = $('<div></div>')
+				.addClass(
+					'ui-dialog-buttonpane ' +
+					'ui-widget-content ' +
+					'ui-helper-clearfix'
+				),
+			uiButtonSet = $( "<div></div>" )
+				.addClass( "ui-dialog-buttonset" )
+				.appendTo( uiDialogButtonPane );
+
+		// if we already have a button pane, remove it
+		self.uiDialog.find('.ui-dialog-buttonpane').remove();
+
+		if (typeof buttons === 'object' && buttons !== null) {
+			$.each(buttons, function() {
+				return !(hasButtons = true);
+			});
+		}
+		if (hasButtons) {
+			$.each(buttons, function(name, props) {
+				props = $.isFunction( props ) ?
+					{ click: props, text: name } :
+					props;
+				var button = $('<button type="button"></button>')
+					.click(function() {
+						props.click.apply(self.element[0], arguments);
+					})
+					.appendTo(uiButtonSet);
+				// can't use .attr( props, true ) with jQuery 1.3.2.
+				$.each( props, function( key, value ) {
+					if ( key === "click" ) {
+						return;
+					}
+					if ( key in attrFn ) {
+						button[ key ]( value );
+					} else {
+						button.attr( key, value );
+					}
+				});
+				if ($.fn.button) {
+					button.button();
+				}
+			});
+			uiDialogButtonPane.appendTo(self.uiDialog);
+		}
+	},
+
+	_makeDraggable: function() {
+		var self = this,
+			options = self.options,
+			doc = $(document),
+			heightBeforeDrag;
+
+		function filteredUi(ui) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		self.uiDialog.draggable({
+			cancel: '.ui-dialog-content, .ui-dialog-titlebar-close',
+			handle: '.ui-dialog-titlebar',
+			containment: 'document',
+			start: function(event, ui) {
+				heightBeforeDrag = options.height === "auto" ? "auto" : $(this).height();
+				$(this).height($(this).height()).addClass("ui-dialog-dragging");
+				self._trigger('dragStart', event, filteredUi(ui));
+			},
+			drag: function(event, ui) {
+				self._trigger('drag', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				options.position = [ui.position.left - doc.scrollLeft(),
+					ui.position.top - doc.scrollTop()];
+				$(this).removeClass("ui-dialog-dragging").height(heightBeforeDrag);
+				self._trigger('dragStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		});
+	},
+
+	_makeResizable: function(handles) {
+		handles = (handles === undefined ? this.options.resizable : handles);
+		var self = this,
+			options = self.options,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = self.uiDialog.css('position'),
+			resizeHandles = (typeof handles === 'string' ?
+				handles	:
+				'n,e,s,w,se,sw,ne,nw'
+			);
+
+		function filteredUi(ui) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		self.uiDialog.resizable({
+			cancel: '.ui-dialog-content',
+			containment: 'document',
+			alsoResize: self.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: self._minHeight(),
+			handles: resizeHandles,
+			start: function(event, ui) {
+				$(this).addClass("ui-dialog-resizing");
+				self._trigger('resizeStart', event, filteredUi(ui));
+			},
+			resize: function(event, ui) {
+				self._trigger('resize', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				$(this).removeClass("ui-dialog-resizing");
+				options.height = $(this).height();
+				options.width = $(this).width();
+				self._trigger('resizeStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		})
+		.css('position', position)
+		.find('.ui-resizable-se').addClass('ui-icon ui-icon-grip-diagonal-se');
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		if (options.height === 'auto') {
+			return options.minHeight;
+		} else {
+			return Math.min(options.minHeight, options.height);
+		}
+	},
+
+	_position: function(position) {
+		var myAt = [],
+			offset = [0, 0],
+			isVisible;
+
+		if (position) {
+			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
+	//		if (typeof position == 'string' || $.isArray(position)) {
+	//			myAt = $.isArray(position) ? position : position.split(' ');
+
+			if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
+				myAt = position.split ? position.split(' ') : [position[0], position[1]];
+				if (myAt.length === 1) {
+					myAt[1] = myAt[0];
+				}
+
+				$.each(['left', 'top'], function(i, offsetPosition) {
+					if (+myAt[i] === myAt[i]) {
+						offset[i] = myAt[i];
+						myAt[i] = offsetPosition;
+					}
+				});
+
+				position = {
+					my: myAt.join(" "),
+					at: myAt.join(" "),
+					offset: offset.join(" ")
+				};
+			} 
+
+			position = $.extend({}, $.ui.dialog.prototype.options.position, position);
+		} else {
+			position = $.ui.dialog.prototype.options.position;
+		}
+
+		// need to show the dialog to get the actual offset in the position plugin
+		isVisible = this.uiDialog.is(':visible');
+		if (!isVisible) {
+			this.uiDialog.show();
+		}
+		this.uiDialog
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.position($.extend({ of: window }, position));
+		if (!isVisible) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var self = this,
+			resizableOptions = {},
+			resize = false;
+
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+			
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+		}
+		if ( this.uiDialog.is( ":data(resizable)" ) ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function(key, value){
+		var self = this,
+			uiDialog = self.uiDialog;
+
+		switch (key) {
+			//handling of deprecated beforeclose (vs beforeClose) option
+			//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+			//TODO: remove in 1.9pre
+			case "beforeclose":
+				key = "beforeClose";
+				break;
+			case "buttons":
+				self._createButtons(value);
+				break;
+			case "closeText":
+				// ensure that we always pass a string
+				self.uiDialogTitlebarCloseText.text("" + value);
+				break;
+			case "dialogClass":
+				uiDialog
+					.removeClass(self.options.dialogClass)
+					.addClass(uiDialogClasses + value);
+				break;
+			case "disabled":
+				if (value) {
+					uiDialog.addClass('ui-dialog-disabled');
+				} else {
+					uiDialog.removeClass('ui-dialog-disabled');
+				}
+				break;
+			case "draggable":
+				var isDraggable = uiDialog.is( ":data(draggable)" );
+				if ( isDraggable && !value ) {
+					uiDialog.draggable( "destroy" );
+				}
+				
+				if ( !isDraggable && value ) {
+					self._makeDraggable();
+				}
+				break;
+			case "position":
+				self._position(value);
+				break;
+			case "resizable":
+				// currently resizable, becoming non-resizable
+				var isResizable = uiDialog.is( ":data(resizable)" );
+				if (isResizable && !value) {
+					uiDialog.resizable('destroy');
+				}
+
+				// currently resizable, changing handles
+				if (isResizable && typeof value === 'string') {
+					uiDialog.resizable('option', 'handles', value);
+				}
+
+				// currently non-resizable, becoming resizable
+				if (!isResizable && value !== false) {
+					self._makeResizable(value);
+				}
+				break;
+			case "title":
+				// convert whatever was passed in o a string, for html() to not throw up
+				$(".ui-dialog-title", self.uiDialogTitlebar).html("" + (value || '&#160;'));
+				break;
+		}
+
+		$.Widget.prototype._setOption.apply(self, arguments);
+	},
+
+	_size: function() {
+		/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		 * divs will both have width and height set, so we need to reset them
+		 */
+		var options = this.options,
+			nonContentHeight,
+			minContentHeight,
+			isVisible = this.uiDialog.is( ":visible" );
+
+		// reset content sizing
+		this.element.show().css({
+			width: 'auto',
+			minHeight: 0,
+			height: 0
+		});
+
+		if (options.minWidth > options.width) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: 'auto',
+				width: options.width
+			})
+			.height();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		
+		if ( options.height === "auto" ) {
+			// only needed for IE6 support
+			if ( $.support.minHeight ) {
+				this.element.css({
+					minHeight: minContentHeight,
+					height: "auto"
+				});
+			} else {
+				this.uiDialog.show();
+				var autoHeight = this.element.css( "height", "auto" ).height();
+				if ( !isVisible ) {
+					this.uiDialog.hide();
+				}
+				this.element.height( Math.max( autoHeight, minContentHeight ) );
+			}
+		} else {
+			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
+		}
+
+		if (this.uiDialog.is(':data(resizable)')) {
+			this.uiDialog.resizable('option', 'minHeight', this._minHeight());
+		}
+	}
+});
+
+$.extend($.ui.dialog, {
+	version: "1.8.22",
+
+	uuid: 0,
+	maxZ: 0,
+
+	getTitleId: function($el) {
+		var id = $el.attr('id');
+		if (!id) {
+			this.uuid += 1;
+			id = this.uuid;
+		}
+		return 'ui-dialog-title-' + id;
+	},
+
+	overlay: function(dialog) {
+		this.$el = $.ui.dialog.overlay.create(dialog);
+	}
+});
+
+$.extend($.ui.dialog.overlay, {
+	instances: [],
+	// reuse old instances due to IE memory leak with alpha transparency (see #5185)
+	oldInstances: [],
+	maxZ: 0,
+	events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
+		function(event) { return event + '.dialog-overlay'; }).join(' '),
+	create: function(dialog) {
+		if (this.instances.length === 0) {
+			// prevent use of anchors and inputs
+			// we use a setTimeout in case the overlay is created from an
+			// event that we're going to be cancelling (see #2804)
+			setTimeout(function() {
+				// handle $(el).dialog().dialog('close') (see #4065)
+				if ($.ui.dialog.overlay.instances.length) {
+					$(document).bind($.ui.dialog.overlay.events, function(event) {
+						// stop events if the z-index of the target is < the z-index of the overlay
+						// we cannot return true when we don't want to cancel the event (#3523)
+						if ($(event.target).zIndex() < $.ui.dialog.overlay.maxZ) {
+							return false;
+						}
+					});
+				}
+			}, 1);
+
+			// allow closing by pressing the escape key
+			$(document).bind('keydown.dialog-overlay', function(event) {
+				if (dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
+					event.keyCode === $.ui.keyCode.ESCAPE) {
+					
+					dialog.close(event);
+					event.preventDefault();
+				}
+			});
+
+			// handle window resize
+			$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
+		}
+
+		var $el = (this.oldInstances.pop() || $('<div></div>').addClass('ui-widget-overlay'))
+			.appendTo(document.body)
+			.css({
+				width: this.width(),
+				height: this.height()
+			});
+
+		if ($.fn.bgiframe) {
+			$el.bgiframe();
+		}
+
+		this.instances.push($el);
+		return $el;
+	},
+
+	destroy: function($el) {
+		var indexOf = $.inArray($el, this.instances);
+		if (indexOf != -1){
+			this.oldInstances.push(this.instances.splice(indexOf, 1)[0]);
+		}
+
+		if (this.instances.length === 0) {
+			$([document, window]).unbind('.dialog-overlay');
+		}
+
+		$el.remove();
+		
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		var maxZ = 0;
+		$.each(this.instances, function() {
+			maxZ = Math.max(maxZ, this.css('z-index'));
+		});
+		this.maxZ = maxZ;
+	},
+
+	height: function() {
+		var scrollHeight,
+			offsetHeight;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollHeight = Math.max(
+				document.documentElement.scrollHeight,
+				document.body.scrollHeight
+			);
+			offsetHeight = Math.max(
+				document.documentElement.offsetHeight,
+				document.body.offsetHeight
+			);
+
+			if (scrollHeight < offsetHeight) {
+				return $(window).height() + 'px';
+			} else {
+				return scrollHeight + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).height() + 'px';
+		}
+	},
+
+	width: function() {
+		var scrollWidth,
+			offsetWidth;
+		// handle IE
+		if ( $.browser.msie ) {
+			scrollWidth = Math.max(
+				document.documentElement.scrollWidth,
+				document.body.scrollWidth
+			);
+			offsetWidth = Math.max(
+				document.documentElement.offsetWidth,
+				document.body.offsetWidth
+			);
+
+			if (scrollWidth < offsetWidth) {
+				return $(window).width() + 'px';
+			} else {
+				return scrollWidth + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).width() + 'px';
+		}
+	},
+
+	resize: function() {
+		/* If the dialog is draggable and the user drags it past the
+		 * right edge of the window, the document becomes wider so we
+		 * need to stretch the overlay. If the user then drags the
+		 * dialog back to the left, the document will become narrower,
+		 * so we need to shrink the overlay to the appropriate size.
+		 * This is handled by shrinking the overlay before setting it
+		 * to the full document size.
+		 */
+		var $overlays = $([]);
+		$.each($.ui.dialog.overlay.instances, function() {
+			$overlays = $overlays.add(this);
+		});
+
+		$overlays.css({
+			width: 0,
+			height: 0
+		}).css({
+			width: $.ui.dialog.overlay.width(),
+			height: $.ui.dialog.overlay.height()
+		});
+	}
+});
+
+$.extend($.ui.dialog.overlay.prototype, {
+	destroy: function() {
+		$.ui.dialog.overlay.destroy(this.$el);
+	}
+});
+
+}(jQuery));
+
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var horizontalPositions = /left|center|right/,
+	verticalPositions = /top|center|bottom/,
+	center = "center",
+	support = {},
+	_position = $.fn.position,
+	_offset = $.fn.offset;
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var target = $( options.of ),
+		targetElem = target[0],
+		collision = ( options.collision || "flip" ).split( " " ),
+		offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
+		targetWidth,
+		targetHeight,
+		basePosition;
+
+	if ( targetElem.nodeType === 9 ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: 0, left: 0 };
+	// TODO: use $.isWindow() in 1.9
+	} else if ( targetElem.setTimeout ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
+	} else if ( targetElem.preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+		targetWidth = targetHeight = 0;
+		basePosition = { top: options.of.pageY, left: options.of.pageX };
+	} else {
+		targetWidth = target.outerWidth();
+		targetHeight = target.outerHeight();
+		basePosition = target.offset();
+	}
+
+	// force my and at to have valid horizontal and veritcal positions
+	// if a value is missing or invalid, it will be converted to center 
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[this] || "" ).split( " " );
+		if ( pos.length === 1) {
+			pos = horizontalPositions.test( pos[0] ) ?
+				pos.concat( [center] ) :
+				verticalPositions.test( pos[0] ) ?
+					[ center ].concat( pos ) :
+					[ center, center ];
+		}
+		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
+		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
+		options[ this ] = pos;
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	// normalize offset option
+	offset[ 0 ] = parseInt( offset[0], 10 ) || 0;
+	if ( offset.length === 1 ) {
+		offset[ 1 ] = offset[ 0 ];
+	}
+	offset[ 1 ] = parseInt( offset[1], 10 ) || 0;
+
+	if ( options.at[0] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[0] === center ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[1] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[1] === center ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	basePosition.left += offset[ 0 ];
+	basePosition.top += offset[ 1 ];
+
+	return this.each(function() {
+		var elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
+			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
+			collisionWidth = elemWidth + marginLeft +
+				( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
+			collisionHeight = elemHeight + marginTop +
+				( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
+			position = $.extend( {}, basePosition ),
+			collisionPosition;
+
+		if ( options.my[0] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[0] === center ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[1] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[1] === center ) {
+			position.top -= elemHeight / 2;
+		}
+
+		// prevent fractions if jQuery version doesn't support them (see #5280)
+		if ( !support.fractions ) {
+			position.left = Math.round( position.left );
+			position.top = Math.round( position.top );
+		}
+
+		collisionPosition = {
+			left: position.left - marginLeft,
+			top: position.top - marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[i] ] ) {
+				$.ui.position[ collision[i] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: offset,
+					my: options.my,
+					at: options.at
+				});
+			}
+		});
+
+		if ( $.fn.bgiframe ) {
+			elem.bgiframe();
+		}
+		elem.offset( $.extend( position, { using: options.using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
+			position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
+		},
+		top: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
+			position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
+		}
+	},
+
+	flip: {
+		left: function( position, data ) {
+			if ( data.at[0] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					-data.targetWidth,
+				offset = -2 * data.offset[ 0 ];
+			position.left += data.collisionPosition.left < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		},
+		top: function( position, data ) {
+			if ( data.at[1] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
+				myOffset = data.my[ 1 ] === "top" ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					-data.targetHeight,
+				offset = -2 * data.offset[ 1 ];
+			position.top += data.collisionPosition.top < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		}
+	}
+};
+
+// offset setter from jQuery 1.4
+if ( !$.offset.setOffset ) {
+	$.offset.setOffset = function( elem, options ) {
+		// set position first, in-case top/left are set even on static elem
+		if ( /static/.test( $.curCSS( elem, "position" ) ) ) {
+			elem.style.position = "relative";
+		}
+		var curElem   = $( elem ),
+			curOffset = curElem.offset(),
+			curTop    = parseInt( $.curCSS( elem, "top",  true ), 10 ) || 0,
+			curLeft   = parseInt( $.curCSS( elem, "left", true ), 10)  || 0,
+			props     = {
+				top:  (options.top  - curOffset.top)  + curTop,
+				left: (options.left - curOffset.left) + curLeft
+			};
+		
+		if ( 'using' in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	};
+
+	$.fn.offset = function( options ) {
+		var elem = this[ 0 ];
+		if ( !elem || !elem.ownerDocument ) { return null; }
+		if ( options ) {
+			if ( $.isFunction( options ) ) {
+				return this.each(function( i ) {
+					$( this ).offset( options.call( this, i, $( this ).offset() ) );
+				});
+			}
+			return this.each(function() {
+				$.offset.setOffset( this, options );
+			});
+		}
+		return _offset.call( this );
+	};
+}
+
+// fraction support test (older versions of jQuery don't support fractions)
+(function () {
+	var body = document.getElementsByTagName( "body" )[ 0 ], 
+		div = document.createElement( "div" ),
+		testElement, testElementParent, testElementStyle, offset, offsetTotal;
+
+	//Create a "fake body" for testing based on method used in jQuery.support
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0,
+		background: "none"
+	};
+	if ( body ) {
+		$.extend( testElementStyle, {
+			position: "absolute",
+			left: "-1000px",
+			top: "-1000px"
+		});
+	}
+	for ( var i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || document.documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	div.style.cssText = "position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;";
+
+	offset = $( div ).offset( function( _, offset ) {
+		return offset;
+	}).offset();
+
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
+
+	offsetTotal = offset.top + offset.left + ( body ? 2000 : 0 );
+	support.fractions = offsetTotal > 21 && offsetTotal < 22;
+})();
+
+}( jQuery ));
+
+(function( $, undefined ) {
+
+$.widget( "ui.progressbar", {
+	options: {
+		value: 0,
+		max: 100
+	},
+
+	min: 0,
+
+	_create: function() {
+		this.element
+			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.attr({
+				role: "progressbar",
+				"aria-valuemin": this.min,
+				"aria-valuemax": this.options.max,
+				"aria-valuenow": this._value()
+			});
+
+		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
+			.appendTo( this.element );
+
+		this.oldValue = this._value();
+		this._refreshValue();
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+
+		this.valueDiv.remove();
+
+		$.Widget.prototype.destroy.apply( this, arguments );
+	},
+
+	value: function( newValue ) {
+		if ( newValue === undefined ) {
+			return this._value();
+		}
+
+		this._setOption( "value", newValue );
+		return this;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "value" ) {
+			this.options.value = value;
+			this._refreshValue();
+			if ( this._value() === this.options.max ) {
+				this._trigger( "complete" );
+			}
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+
+	_value: function() {
+		var val = this.options.value;
+		// normalize invalid value
+		if ( typeof val !== "number" ) {
+			val = 0;
+		}
+		return Math.min( this.options.max, Math.max( this.min, val ) );
+	},
+
+	_percentage: function() {
+		return 100 * this._value() / this.options.max;
+	},
+
+	_refreshValue: function() {
+		var value = this.value();
+		var percentage = this._percentage();
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+
+		this.valueDiv
+			.toggle( value > this.min )
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
+		this.element.attr( "aria-valuenow", value );
+	}
+});
+
+$.extend( $.ui.progressbar, {
+	version: "1.8.22"
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null
+	},
+
+	_create: function() {
+		var self = this,
+			o = this.options,
+			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+			handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+			handleCount = ( o.values && o.values.length ) || 1,
+			handles = [];
+
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" +
+				( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) );
+
+		this.range = $([]);
+
+		if ( o.range ) {
+			if ( o.range === true ) {
+				if ( !o.values ) {
+					o.values = [ this._valueMin(), this._valueMin() ];
+				}
+				if ( o.values.length && o.values.length !== 2 ) {
+					o.values = [ o.values[0], o.values[0] ];
+				}
+			}
+
+			this.range = $( "<div></div>" )
+				.appendTo( this.element )
+				.addClass( "ui-slider-range" +
+				// note: this isn't the most fittingly semantic framework class for this element,
+				// but worked best visually with a variety of themes
+				" ui-widget-header" + 
+				( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
+		}
+
+		for ( var i = existingHandles.length; i < handleCount; i += 1 ) {
+			handles.push( handle );
+		}
+
+		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( self.element ) );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.add( this.range ).filter( "a" )
+			.click(function( event ) {
+				event.preventDefault();
+			})
+			.hover(function() {
+				if ( !o.disabled ) {
+					$( this ).addClass( "ui-state-hover" );
+				}
+			}, function() {
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.focus(function() {
+				if ( !o.disabled ) {
+					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
+					$( this ).addClass( "ui-state-focus" );
+				} else {
+					$( this ).blur();
+				}
+			})
+			.blur(function() {
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		this.handles.each(function( i ) {
+			$( this ).data( "index.ui-slider-handle", i );
+		});
+
+		this.handles
+			.keydown(function( event ) {
+				var index = $( this ).data( "index.ui-slider-handle" ),
+					allowed,
+					curVal,
+					newVal,
+					step;
+	
+				if ( self.options.disabled ) {
+					return;
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+					case $.ui.keyCode.END:
+					case $.ui.keyCode.PAGE_UP:
+					case $.ui.keyCode.PAGE_DOWN:
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						event.preventDefault();
+						if ( !self._keySliding ) {
+							self._keySliding = true;
+							$( this ).addClass( "ui-state-active" );
+							allowed = self._start( event, index );
+							if ( allowed === false ) {
+								return;
+							}
+						}
+						break;
+				}
+	
+				step = self.options.step;
+				if ( self.options.values && self.options.values.length ) {
+					curVal = newVal = self.values( index );
+				} else {
+					curVal = newVal = self.value();
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+						newVal = self._valueMin();
+						break;
+					case $.ui.keyCode.END:
+						newVal = self._valueMax();
+						break;
+					case $.ui.keyCode.PAGE_UP:
+						newVal = self._trimAlignValue( curVal + ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.PAGE_DOWN:
+						newVal = self._trimAlignValue( curVal - ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+						if ( curVal === self._valueMax() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal + step );
+						break;
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						if ( curVal === self._valueMin() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal - step );
+						break;
+				}
+	
+				self._slide( event, index, newVal );
+			})
+			.keyup(function( event ) {
+				var index = $( this ).data( "index.ui-slider-handle" );
+	
+				if ( self._keySliding ) {
+					self._keySliding = false;
+					self._stop( event, index );
+					self._change( event, index );
+					$( this ).removeClass( "ui-state-active" );
+				}
+	
+			});
+
+		this._refreshValue();
+
+		this._animateOff = false;
+	},
+
+	destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-slider-disabled" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" )
+			.removeData( "slider" )
+			.unbind( ".slider" );
+
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function( event ) {
+		var o = this.options,
+			position,
+			normValue,
+			distance,
+			closestHandle,
+			self,
+			index,
+			allowed,
+			offset,
+			mouseOverHandle;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		self = this;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - self.values(i) );
+			if ( distance > thisDistance ) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		// workaround for bug #3736 (if both handles of a range are at 0,
+		// the first is always used as the one with least distance,
+		// and moving it is obviously prevented by preventing negative ranges)
+		if( o.range === true && this.values(1) === o.min ) {
+			index += 1;
+			closestHandle = $( this.handles[index] );
+		}
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		self._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+		
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function( event ) {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+		
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+	
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) && 
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+			return;
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+			return;
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "disabled":
+				if ( value ) {
+					this.handles.filter( ".ui-state-focus" ).blur();
+					this.handles.removeClass( "ui-state-hover" );
+					this.handles.propAttr( "disabled", true );
+					this.element.addClass( "ui-disabled" );
+				} else {
+					this.handles.propAttr( "disabled", false );
+					this.element.removeClass( "ui-disabled" );
+				}
+				break;
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		}
+	},
+	
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step,
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+	
+	_refreshValue: function() {
+		var oRange = this.options.range,
+			o = this.options,
+			self = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			valPercent,
+			_set = {},
+			lastValPercent,
+			value,
+			valueMin,
+			valueMax;
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i, j ) {
+				valPercent = ( self.values(i) - self._valueMin() ) / ( self._valueMax() - self._valueMin() ) * 100;
+				_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( self.options.range === true ) {
+					if ( self.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	}
+
+});
+
+$.extend( $.ui.slider, {
+	version: "1.8.22"
+});
+
+}(jQuery));
+
+(function( $, undefined ) {
+
+var tabId = 0,
+	listId = 0;
+
+function getNextTabId() {
+	return ++tabId;
+}
+
+function getNextListId() {
+	return ++listId;
+}
+
+$.widget( "ui.tabs", {
+	options: {
+		add: null,
+		ajaxOptions: null,
+		cache: false,
+		cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
+		collapsible: false,
+		disable: null,
+		disabled: [],
+		enable: null,
+		event: "click",
+		fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+		idPrefix: "ui-tabs-",
+		load: null,
+		panelTemplate: "<div></div>",
+		remove: null,
+		select: null,
+		show: null,
+		spinner: "<em>Loading&#8230;</em>",
+		tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
+	},
+
+	_create: function() {
+		this._tabify( true );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key == "selected" ) {
+			if (this.options.collapsible && value == this.options.selected ) {
+				return;
+			}
+			this.select( value );
+		} else {
+			this.options[ key ] = value;
+			this._tabify();
+		}
+	},
+
+	_tabId: function( a ) {
+		return a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF-]/g, "" ) ||
+			this.options.idPrefix + getNextTabId();
+	},
+
+	_sanitizeSelector: function( hash ) {
+		// we need this because an id may contain a ":"
+		return hash.replace( /:/g, "\\:" );
+	},
+
+	_cookie: function() {
+		var cookie = this.cookie ||
+			( this.cookie = this.options.cookie.name || "ui-tabs-" + getNextListId() );
+		return $.cookie.apply( null, [ cookie ].concat( $.makeArray( arguments ) ) );
+	},
+
+	_ui: function( tab, panel ) {
+		return {
+			tab: tab,
+			panel: panel,
+			index: this.anchors.index( tab )
+		};
+	},
+
+	_cleanup: function() {
+		// restore all former loading tabs labels
+		this.lis.filter( ".ui-state-processing" )
+			.removeClass( "ui-state-processing" )
+			.find( "span:data(label.tabs)" )
+				.each(function() {
+					var el = $( this );
+					el.html( el.data( "label.tabs" ) ).removeData( "label.tabs" );
+				});
+	},
+
+	_tabify: function( init ) {
+		var self = this,
+			o = this.options,
+			fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
+
+		this.list = this.element.find( "ol,ul" ).eq( 0 );
+		this.lis = $( " > li:has(a[href])", this.list );
+		this.anchors = this.lis.map(function() {
+			return $( "a", this )[ 0 ];
+		});
+		this.panels = $( [] );
+
+		this.anchors.each(function( i, a ) {
+			var href = $( a ).attr( "href" );
+			// For dynamically created HTML that contains a hash as href IE < 8 expands
+			// such href to the full page url with hash and then misinterprets tab as ajax.
+			// Same consideration applies for an added tab with a fragment identifier
+			// since a[href=#fragment-identifier] does unexpectedly not match.
+			// Thus normalize href attribute...
+			var hrefBase = href.split( "#" )[ 0 ],
+				baseEl;
+			if ( hrefBase && ( hrefBase === location.toString().split( "#" )[ 0 ] ||
+					( baseEl = $( "base" )[ 0 ]) && hrefBase === baseEl.href ) ) {
+				href = a.hash;
+				a.href = href;
+			}
+
+			// inline tab
+			if ( fragmentId.test( href ) ) {
+				self.panels = self.panels.add( self.element.find( self._sanitizeSelector( href ) ) );
+			// remote tab
+			// prevent loading the page itself if href is just "#"
+			} else if ( href && href !== "#" ) {
+				// required for restore on destroy
+				$.data( a, "href.tabs", href );
+
+				// TODO until #3808 is fixed strip fragment identifier from url
+				// (IE fails to load from such url)
+				$.data( a, "load.tabs", href.replace( /#.*$/, "" ) );
+
+				var id = self._tabId( a );
+				a.href = "#" + id;
+				var $panel = self.element.find( "#" + id );
+				if ( !$panel.length ) {
+					$panel = $( o.panelTemplate )
+						.attr( "id", id )
+						.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+						.insertAfter( self.panels[ i - 1 ] || self.list );
+					$panel.data( "destroy.tabs", true );
+				}
+				self.panels = self.panels.add( $panel );
+			// invalid tab href
+			} else {
+				o.disabled.push( i );
+			}
+		});
+
+		// initialization from scratch
+		if ( init ) {
+			// attach necessary classes for styling
+			this.element.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" );
+			this.list.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+			this.lis.addClass( "ui-state-default ui-corner-top" );
+			this.panels.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" );
+
+			// Selected tab
+			// use "selected" option or try to retrieve:
+			// 1. from fragment identifier in url
+			// 2. from cookie
+			// 3. from selected class attribute on <li>
+			if ( o.selected === undefined ) {
+				if ( location.hash ) {
+					this.anchors.each(function( i, a ) {
+						if ( a.hash == location.hash ) {
+							o.selected = i;
+							return false;
+						}
+					});
+				}
+				if ( typeof o.selected !== "number" && o.cookie ) {
+					o.selected = parseInt( self._cookie(), 10 );
+				}
+				if ( typeof o.selected !== "number" && this.lis.filter( ".ui-tabs-selected" ).length ) {
+					o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
+				}
+				o.selected = o.selected || ( this.lis.length ? 0 : -1 );
+			} else if ( o.selected === null ) { // usage of null is deprecated, TODO remove in next release
+				o.selected = -1;
+			}
+
+			// sanity check - default to first tab...
+			o.selected = ( ( o.selected >= 0 && this.anchors[ o.selected ] ) || o.selected < 0 )
+				? o.selected
+				: 0;
+
+			// Take disabling tabs via class attribute from HTML
+			// into account and update option properly.
+			// A selected tab cannot become disabled.
+			o.disabled = $.unique( o.disabled.concat(
+				$.map( this.lis.filter( ".ui-state-disabled" ), function( n, i ) {
+					return self.lis.index( n );
+				})
+			) ).sort();
+
+			if ( $.inArray( o.selected, o.disabled ) != -1 ) {
+				o.disabled.splice( $.inArray( o.selected, o.disabled ), 1 );
+			}
+
+			// highlight selected tab
+			this.panels.addClass( "ui-tabs-hide" );
+			this.lis.removeClass( "ui-tabs-selected ui-state-active" );
+			// check for length avoids error when initializing empty list
+			if ( o.selected >= 0 && this.anchors.length ) {
+				self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
+				this.lis.eq( o.selected ).addClass( "ui-tabs-selected ui-state-active" );
+
+				// seems to be expected behavior that the show callback is fired
+				self.element.queue( "tabs", function() {
+					self._trigger( "show", null,
+						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) )[ 0 ] ) );
+				});
+
+				this.load( o.selected );
+			}
+
+			// clean up to avoid memory leaks in certain versions of IE 6
+			// TODO: namespace this event
+			$( window ).bind( "unload", function() {
+				self.lis.add( self.anchors ).unbind( ".tabs" );
+				self.lis = self.anchors = self.panels = null;
+			});
+		// update selected after add/remove
+		} else {
+			o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
+		}
+
+		// update collapsible
+		// TODO: use .toggleClass()
+		this.element[ o.collapsible ? "addClass" : "removeClass" ]( "ui-tabs-collapsible" );
+
+		// set or update cookie after init and add/remove respectively
+		if ( o.cookie ) {
+			this._cookie( o.selected, o.cookie );
+		}
+
+		// disable tabs
+		for ( var i = 0, li; ( li = this.lis[ i ] ); i++ ) {
+			$( li )[ $.inArray( i, o.disabled ) != -1 &&
+				// TODO: use .toggleClass()
+				!$( li ).hasClass( "ui-tabs-selected" ) ? "addClass" : "removeClass" ]( "ui-state-disabled" );
+		}
+
+		// reset cache if switching from cached to not cached
+		if ( o.cache === false ) {
+			this.anchors.removeData( "cache.tabs" );
+		}
+
+		// remove all handlers before, tabify may run on existing tabs after add or option change
+		this.lis.add( this.anchors ).unbind( ".tabs" );
+
+		if ( o.event !== "mouseover" ) {
+			var addState = function( state, el ) {
+				if ( el.is( ":not(.ui-state-disabled)" ) ) {
+					el.addClass( "ui-state-" + state );
+				}
+			};
+			var removeState = function( state, el ) {
+				el.removeClass( "ui-state-" + state );
+			};
+			this.lis.bind( "mouseover.tabs" , function() {
+				addState( "hover", $( this ) );
+			});
+			this.lis.bind( "mouseout.tabs", function() {
+				removeState( "hover", $( this ) );
+			});
+			this.anchors.bind( "focus.tabs", function() {
+				addState( "focus", $( this ).closest( "li" ) );
+			});
+			this.anchors.bind( "blur.tabs", function() {
+				removeState( "focus", $( this ).closest( "li" ) );
+			});
+		}
+
+		// set up animations
+		var hideFx, showFx;
+		if ( o.fx ) {
+			if ( $.isArray( o.fx ) ) {
+				hideFx = o.fx[ 0 ];
+				showFx = o.fx[ 1 ];
+			} else {
+				hideFx = showFx = o.fx;
+			}
+		}
+
+		// Reset certain styles left over from animation
+		// and prevent IE's ClearType bug...
+		function resetStyle( $el, fx ) {
+			$el.css( "display", "" );
+			if ( !$.support.opacity && fx.opacity ) {
+				$el[ 0 ].style.removeAttribute( "filter" );
+			}
+		}
+
+		// Show a tab...
+		var showTab = showFx
+			? function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.hide().removeClass( "ui-tabs-hide" ) // avoid flicker that way
+					.animate( showFx, showFx.duration || "normal", function() {
+						resetStyle( $show, showFx );
+						self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
+					});
+			}
+			: function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.removeClass( "ui-tabs-hide" );
+				self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
+			};
+
+		// Hide a tab, $show is optional...
+		var hideTab = hideFx
+			? function( clicked, $hide ) {
+				$hide.animate( hideFx, hideFx.duration || "normal", function() {
+					self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+					$hide.addClass( "ui-tabs-hide" );
+					resetStyle( $hide, hideFx );
+					self.element.dequeue( "tabs" );
+				});
+			}
+			: function( clicked, $hide, $show ) {
+				self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+				$hide.addClass( "ui-tabs-hide" );
+				self.element.dequeue( "tabs" );
+			};
+
+		// attach tab event handler, unbind to avoid duplicates from former tabifying...
+		this.anchors.bind( o.event + ".tabs", function() {
+			var el = this,
+				$li = $(el).closest( "li" ),
+				$hide = self.panels.filter( ":not(.ui-tabs-hide)" ),
+				$show = self.element.find( self._sanitizeSelector( el.hash ) );
+
+			// If tab is already selected and not collapsible or tab disabled or
+			// or is already loading or click callback returns false stop here.
+			// Check if click handler returns false last so that it is not executed
+			// for a disabled or loading tab!
+			if ( ( $li.hasClass( "ui-tabs-selected" ) && !o.collapsible) ||
+				$li.hasClass( "ui-state-disabled" ) ||
+				$li.hasClass( "ui-state-processing" ) ||
+				self.panels.filter( ":animated" ).length ||
+				self._trigger( "select", null, self._ui( this, $show[ 0 ] ) ) === false ) {
+				this.blur();
+				return false;
+			}
+
+			o.selected = self.anchors.index( this );
+
+			self.abort();
+
+			// if tab may be closed
+			if ( o.collapsible ) {
+				if ( $li.hasClass( "ui-tabs-selected" ) ) {
+					o.selected = -1;
+
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
+					}
+
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					}).dequeue( "tabs" );
+
+					this.blur();
+					return false;
+				} else if ( !$hide.length ) {
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
+					}
+
+					self.element.queue( "tabs", function() {
+						showTab( el, $show );
+					});
+
+					// TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
+					self.load( self.anchors.index( this ) );
+
+					this.blur();
+					return false;
+				}
+			}
+
+			if ( o.cookie ) {
+				self._cookie( o.selected, o.cookie );
+			}
+
+			// show new tab
+			if ( $show.length ) {
+				if ( $hide.length ) {
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					});
+				}
+				self.element.queue( "tabs", function() {
+					showTab( el, $show );
+				});
+
+				self.load( self.anchors.index( this ) );
+			} else {
+				throw "jQuery UI Tabs: Mismatching fragment identifier.";
+			}
+
+			// Prevent IE from keeping other link focussed when using the back button
+			// and remove dotted border from clicked link. This is controlled via CSS
+			// in modern browsers; blur() removes focus from address bar in Firefox
+			// which can become a usability and annoying problem with tabs('rotate').
+			if ( $.browser.msie ) {
+				this.blur();
+			}
+		});
+
+		// disable click in any case
+		this.anchors.bind( "click.tabs", function(){
+			return false;
+		});
+	},
+
+    _getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		// also sanitizes numerical indexes to valid values.
+		if ( typeof index == "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
+		}
+
+		return index;
+	},
+
+	destroy: function() {
+		var o = this.options;
+
+		this.abort();
+
+		this.element
+			.unbind( ".tabs" )
+			.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" )
+			.removeData( "tabs" );
+
+		this.list.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+
+		this.anchors.each(function() {
+			var href = $.data( this, "href.tabs" );
+			if ( href ) {
+				this.href = href;
+			}
+			var $this = $( this ).unbind( ".tabs" );
+			$.each( [ "href", "load", "cache" ], function( i, prefix ) {
+				$this.removeData( prefix + ".tabs" );
+			});
+		});
+
+		this.lis.unbind( ".tabs" ).add( this.panels ).each(function() {
+			if ( $.data( this, "destroy.tabs" ) ) {
+				$( this ).remove();
+			} else {
+				$( this ).removeClass([
+					"ui-state-default",
+					"ui-corner-top",
+					"ui-tabs-selected",
+					"ui-state-active",
+					"ui-state-hover",
+					"ui-state-focus",
+					"ui-state-disabled",
+					"ui-tabs-panel",
+					"ui-widget-content",
+					"ui-corner-bottom",
+					"ui-tabs-hide"
+				].join( " " ) );
+			}
+		});
+
+		if ( o.cookie ) {
+			this._cookie( null, o.cookie );
+		}
+
+		return this;
+	},
+
+	add: function( url, label, index ) {
+		if ( index === undefined ) {
+			index = this.anchors.length;
+		}
+
+		var self = this,
+			o = this.options,
+			$li = $( o.tabTemplate.replace( /#\{href\}/g, url ).replace( /#\{label\}/g, label ) ),
+			id = !url.indexOf( "#" ) ? url.replace( "#", "" ) : this._tabId( $( "a", $li )[ 0 ] );
+
+		$li.addClass( "ui-state-default ui-corner-top" ).data( "destroy.tabs", true );
+
+		// try to find an existing element before creating a new one
+		var $panel = self.element.find( "#" + id );
+		if ( !$panel.length ) {
+			$panel = $( o.panelTemplate )
+				.attr( "id", id )
+				.data( "destroy.tabs", true );
+		}
+		$panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" );
+
+		if ( index >= this.lis.length ) {
+			$li.appendTo( this.list );
+			$panel.appendTo( this.list[ 0 ].parentNode );
+		} else {
+			$li.insertBefore( this.lis[ index ] );
+			$panel.insertBefore( this.panels[ index ] );
+		}
+
+		o.disabled = $.map( o.disabled, function( n, i ) {
+			return n >= index ? ++n : n;
+		});
+
+		this._tabify();
+
+		if ( this.anchors.length == 1 ) {
+			o.selected = 0;
+			$li.addClass( "ui-tabs-selected ui-state-active" );
+			$panel.removeClass( "ui-tabs-hide" );
+			this.element.queue( "tabs", function() {
+				self._trigger( "show", null, self._ui( self.anchors[ 0 ], self.panels[ 0 ] ) );
+			});
+
+			this.load( 0 );
+		}
+
+		this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		return this;
+	},
+
+	remove: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options,
+			$li = this.lis.eq( index ).remove(),
+			$panel = this.panels.eq( index ).remove();
+
+		// If selected tab was removed focus tab to the right or
+		// in case the last tab was removed the tab to the left.
+		if ( $li.hasClass( "ui-tabs-selected" ) && this.anchors.length > 1) {
+			this.select( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
+		}
+
+		o.disabled = $.map(
+			$.grep( o.disabled, function(n, i) {
+				return n != index;
+			}),
+			function( n, i ) {
+				return n >= index ? --n : n;
+			});
+
+		this._tabify();
+
+		this._trigger( "remove", null, this._ui( $li.find( "a" )[ 0 ], $panel[ 0 ] ) );
+		return this;
+	},
+
+	enable: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options;
+		if ( $.inArray( index, o.disabled ) == -1 ) {
+			return;
+		}
+
+		this.lis.eq( index ).removeClass( "ui-state-disabled" );
+		o.disabled = $.grep( o.disabled, function( n, i ) {
+			return n != index;
+		});
+
+		this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		return this;
+	},
+
+	disable: function( index ) {
+		index = this._getIndex( index );
+		var self = this, o = this.options;
+		// cannot disable already selected tab
+		if ( index != o.selected ) {
+			this.lis.eq( index ).addClass( "ui-state-disabled" );
+
+			o.disabled.push( index );
+			o.disabled.sort();
+
+			this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		}
+
+		return this;
+	},
+
+	select: function( index ) {
+		index = this._getIndex( index );
+		if ( index == -1 ) {
+			if ( this.options.collapsible && this.options.selected != -1 ) {
+				index = this.options.selected;
+			} else {
+				return this;
+			}
+		}
+		this.anchors.eq( index ).trigger( this.options.event + ".tabs" );
+		return this;
+	},
+
+	load: function( index ) {
+		index = this._getIndex( index );
+		var self = this,
+			o = this.options,
+			a = this.anchors.eq( index )[ 0 ],
+			url = $.data( a, "load.tabs" );
+
+		this.abort();
+
+		// not remote or from cache
+		if ( !url || this.element.queue( "tabs" ).length !== 0 && $.data( a, "cache.tabs" ) ) {
+			this.element.dequeue( "tabs" );
+			return;
+		}
+
+		// load remote from here on
+		this.lis.eq( index ).addClass( "ui-state-processing" );
+
+		if ( o.spinner ) {
+			var span = $( "span", a );
+			span.data( "label.tabs", span.html() ).html( o.spinner );
+		}
+
+		this.xhr = $.ajax( $.extend( {}, o.ajaxOptions, {
+			url: url,
+			success: function( r, s ) {
+				self.element.find( self._sanitizeSelector( a.hash ) ).html( r );
+
+				// take care of tab labels
+				self._cleanup();
+
+				if ( o.cache ) {
+					$.data( a, "cache.tabs", true );
+				}
+
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
+				try {
+					o.ajaxOptions.success( r, s );
+				}
+				catch ( e ) {}
+			},
+			error: function( xhr, s, e ) {
+				// take care of tab labels
+				self._cleanup();
+
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
+				try {
+					// Passing index avoid a race condition when this method is
+					// called after the user has selected another tab.
+					// Pass the anchor that initiated this request allows
+					// loadError to manipulate the tab content panel via $(a.hash)
+					o.ajaxOptions.error( xhr, s, index, a );
+				}
+				catch ( e ) {}
+			}
+		} ) );
+
+		// last, so that load event is fired before show...
+		self.element.dequeue( "tabs" );
+
+		return this;
+	},
+
+	abort: function() {
+		// stop possibly running animations
+		this.element.queue( [] );
+		this.panels.stop( false, true );
+
+		// "tabs" queue must not contain more than two elements,
+		// which are the callbacks for the latest clicked tab...
+		this.element.queue( "tabs", this.element.queue( "tabs" ).splice( -2, 2 ) );
+
+		// terminate pending requests from other tabs
+		if ( this.xhr ) {
+			this.xhr.abort();
+			delete this.xhr;
+		}
+
+		// take care of tab labels
+		this._cleanup();
+		return this;
+	},
+
+	url: function( index, url ) {
+		this.anchors.eq( index ).removeData( "cache.tabs" ).data( "load.tabs", url );
+		return this;
+	},
+
+	length: function() {
+		return this.anchors.length;
+	}
+});
+
+$.extend( $.ui.tabs, {
+	version: "1.8.22"
+});
+
+/*
+ * Tabs Extensions
+ */
+
+/*
+ * Rotate
+ */
+$.extend( $.ui.tabs.prototype, {
+	rotation: null,
+	rotate: function( ms, continuing ) {
+		var self = this,
+			o = this.options;
+
+		var rotate = self._rotate || ( self._rotate = function( e ) {
+			clearTimeout( self.rotation );
+			self.rotation = setTimeout(function() {
+				var t = o.selected;
+				self.select( ++t < self.anchors.length ? t : 0 );
+			}, ms );
+			
+			if ( e ) {
+				e.stopPropagation();
+			}
+		});
+
+		var stop = self._unrotate || ( self._unrotate = !continuing
+			? function(e) {
+				if (e.clientX) { // in case of a true click
+					self.rotate(null);
+				}
+			}
+			: function( e ) {
+				rotate();
+			});
+
+		// start rotation
+		if ( ms ) {
+			this.element.bind( "tabsshow", rotate );
+			this.anchors.bind( o.event + ".tabs", stop );
+			rotate();
+		// stop rotation
+		} else {
+			clearTimeout( self.rotation );
+			this.element.unbind( "tabsshow", rotate );
+			this.anchors.unbind( o.event + ".tabs", stop );
+			delete this._rotate;
+			delete this._unrotate;
+		}
+
+		return this;
+	}
+});
+
+})( jQuery );
diff --git a/extensions/themes/silverblue/scripts/libraries/jquery-ui.js b/extensions/themes/silverblue/scripts/libraries/jquery-ui.js
deleted file mode 100644
index a6ae8abff..000000000
--- a/extensions/themes/silverblue/scripts/libraries/jquery-ui.js
+++ /dev/null
@@ -1,781 +0,0 @@
-/*!
- * jQuery UI 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.8",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
-NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
-"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
-if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
-"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
-d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
-c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
-b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-;/*!
- * jQuery UI Widget 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
-a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
-e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
-this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
-widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
-enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
-;/*!
- * jQuery UI Mouse 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
-(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(true===c.data(b.target,a.widgetName+".preventClickEvent")){c.removeData(b.target,a.widgetName+".preventClickEvent");b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=
-a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
-this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);
-return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&c.data(a.target,this.widgetName+".preventClickEvent",
-true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-;/*
- * jQuery UI Position 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
-left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
-k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
-m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
-d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
-a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
-g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
-;/*
- * jQuery UI Draggable 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
-"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
-this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
-d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
-this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if(!this.element[0]||!this.element[0].parentNode)return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,
-b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
-a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
-0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
-this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment==
-"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?
-0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
-10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor==
-Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
-f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;
-if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/
-b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-
-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=
-this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.8"});
-d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=
-0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=
-c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,
-true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=
-0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=
-a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},
-stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=
-document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-
-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-
-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable",
-"snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=
-c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",
-{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,
-left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,
-a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,
-b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
-;/*
- * jQuery UI Droppable 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.mouse.js
- *	jquery.ui.draggable.js
- */
-(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
-a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
-this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
-this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
-d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
-a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.8"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
-switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
-i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
-"none";if(c[f].visible){c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight};e=="mousedown"&&c[f]._activate.call(c[f],b)}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
-a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=
-d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery);
-;/*
- * jQuery UI Resizable 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
-_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
-top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
-this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
-nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
-String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
-this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
-if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
-d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
-this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
-this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
-b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
-f={width:c.size.width-(f?0:c.sizeDiff.width),height:c.size.height-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",
-b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=
-a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,
-k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),
-c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=
-this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+
-a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,
-arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,
-{version:"1.8.8"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,
-function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=
-(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=
-false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-
-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",
-b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top",
-"Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,
-f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=
-a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+
-a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&
-e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",
-height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=
-d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
-;/*
- * jQuery UI Selectable 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
-selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
-c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
-c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
-this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
-a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
-!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
-e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.8"})})(jQuery);
-;/*
- * jQuery UI Sortable 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
-this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,
-arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=
-c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,
-{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();
-if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",
-a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");
-if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+
-this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+
-b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+
-"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,
-c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==
-document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp();this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",
-null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):
-d(this.domPosition.parent).prepend(this.currentItem);return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||
-"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+
-this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?
-2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},
-_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=
-this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=
-this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");
-if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=
-0;b--){var c=this.items[b],e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=
-this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},
-update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=
-null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));
-this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,
-null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||
-d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a==
-"string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition==
-"absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==
-"relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},
-_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-
-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),
-10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?
-this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=
-this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+
-this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?
-g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
-e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==
-f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",
-f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",
-g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=
-0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});
-d.extend(d.ui.sortable,{version:"1.8.8"})})(jQuery);
-;/*
- * jQuery UI Accordion 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
-a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
-if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",
-function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+
-a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex");
-this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
-b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
-a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
-c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
-if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
-if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(),
-e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight||
-e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",
-tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.8",animations:{slide:function(a,b){a=c.extend({easing:"swing",
-duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,
-overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",
-paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
-;/*
- * jQuery UI Autocomplete 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.position.js
- */
-(function(d){d.widget("ui.autocomplete",{options:{appendTo:"body",delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,f;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){f=false;var e=d.ui.keyCode;
-switch(c.keyCode){case e.PAGE_UP:a._move("previousPage",c);break;case e.PAGE_DOWN:a._move("nextPage",c);break;case e.UP:a._move("previous",c);c.preventDefault();break;case e.DOWN:a._move("next",c);c.preventDefault();break;case e.ENTER:case e.NUMPAD_ENTER:if(a.menu.active){f=true;c.preventDefault()}case e.TAB:if(!a.menu.active)return;a.menu.select(c);break;case e.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=a.element.val()){a.selectedItem=
-null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(f){f=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||
-"body",b)[0]).mousedown(function(c){var e=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(g){g.target!==a.element[0]&&g.target!==e&&!d.ui.contains(e,g.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,e){e=e.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:e})&&/^key/.test(c.originalEvent.type)&&a.element.val(e.value)},selected:function(c,e){var g=e.item.data("item.autocomplete"),
-h=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=h;setTimeout(function(){a.previous=h;a.selectedItem=g},1)}false!==a._trigger("select",c,{item:g})&&a.element.val(g.value);a.term=a.element.val();a.close(c);a.selectedItem=g},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");
-this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,f;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,e){e(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source===
-"string"){f=this.options.source;this.source=function(c,e){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:f,data:c,dataType:"json",success:function(g,h,i){i===a.xhr&&e(g);a.xhr=null},error:function(g){g===a.xhr&&e([]);a.xhr=null}})}}else this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;
-this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==
-this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position))},
-_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var f=this;d.each(b,function(c,e){f._renderItem(a,e)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);
-else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},filter:function(a,b){var f=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return f.test(c.label||c.value||c)})}})})(jQuery);
-(function(d){d.widget("ui.menu",{_create:function(){var a=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(b){if(d(b.target).closest(".ui-menu-item a").length){b.preventDefault();a.select(b)}});this.refresh()},refresh:function(){var a=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
--1).mouseenter(function(b){a.activate(b,d(this).parent())}).mouseleave(function(){a.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var f=b.offset().top-this.element.offset().top,c=this.element.attr("scrollTop"),e=this.element.height();if(f<0)this.element.attr("scrollTop",c+f);else f>=e&&this.element.attr("scrollTop",c+f-e+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",a,{item:b})},
-deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null}},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,f){if(this.active){a=this.active[a+"All"](".ui-menu-item").eq(0);
-a.length?this.activate(f,a):this.activate(f,this.element.children(b))}else this.activate(f,this.element.children(b))},nextPage:function(a){if(this.hasScroll())if(!this.active||this.last())this.activate(a,this.element.children(".ui-menu-item:first"));else{var b=this.active.offset().top,f=this.element.height(),c=this.element.children(".ui-menu-item").filter(function(){var e=d(this).offset().top-b-f+d(this).height();return e<10&&e>-10});c.length||(c=this.element.children(".ui-menu-item:last"));this.activate(a,
-c)}else this.activate(a,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(a){if(this.hasScroll())if(!this.active||this.first())this.activate(a,this.element.children(".ui-menu-item:last"));else{var b=this.active.offset().top,f=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-b+f-d(this).height();return c<10&&c>-10});result.length||(result=this.element.children(".ui-menu-item:first"));
-this.activate(a,result)}else this.activate(a,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element.attr("scrollHeight")},select:function(a){this._trigger("selected",a,{item:this.active})}})})(jQuery);
-;/*
- * jQuery UI Button 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(a){var g,i=function(b){a(":ui-button",b.target.form).each(function(){var c=a(this).data("button");setTimeout(function(){c.refresh()},1)})},h=function(b){var c=b.name,d=b.form,e=a([]);if(c)e=d?a(d).find("[name='"+c+"']"):a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form});return e};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",
-i);if(typeof this.options.disabled!=="boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d=this.type==="checkbox"||this.type==="radio",e="ui-state-hover"+(!d?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",
-function(){if(!c.disabled){a(this).addClass("ui-state-hover");this===g&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||a(this).removeClass(e)}).bind("focus.button",function(){a(this).addClass("ui-state-focus")}).bind("blur.button",function(){a(this).removeClass("ui-state-focus")});d&&this.element.bind("change.button",function(){b.refresh()});if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).toggleClass("ui-state-active");
-b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);var f=b.element[0];h(f).not(f).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");
-g=this;a(document).one("mouseup",function(){g=null})}).bind("mouseup.button",function(){if(c.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(f){if(c.disabled)return false;if(f.keyCode==a.ui.keyCode.SPACE||f.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(f){f.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",
-c.disabled)},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type==="radio"){this.buttonElement=this.element.parents().last().find("label[for="+this.element.attr("id")+"]");this.element.addClass("ui-helper-hidden-accessible");var b=this.element.is(":checked");b&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=
-this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||
-this.buttonElement.removeAttr("title");a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")h(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
-true):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
-c=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary;if(d.primary||d.secondary){b.addClass("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>");d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>");if(!this.options.text){b.addClass(e?"ui-button-icons-only":"ui-button-icon-only").removeClass("ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary");
-this.hasTitle||b.attr("title",c)}}else b.addClass("ui-button-text-only")}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end()},
-destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");a.Widget.prototype.destroy.call(this)}})})(jQuery);
-;/*
- * jQuery UI Dialog 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *  jquery.ui.button.js
- *	jquery.ui.draggable.js
- *	jquery.ui.mouse.js
- *	jquery.ui.position.js
- *	jquery.ui.resizable.js
- */
-(function(c,j){var k={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},l={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&
-c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",
--1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role",
-"button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=
-b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");a.uiDialog.remove();a.originalTitle&&
-a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==b.uiDialog[0]){e=c(this).css("z-index");
-isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);
-d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===f[0]&&e.shiftKey){g.focus(1);return false}}});
-c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,function(){return!(d=true)});if(d){c.each(a,function(f,
-h){h=c.isFunction(h)?{click:h,text:f}:h;f=c('<button type="button"></button>').attr(h,true).unbind("click").click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.fn.button&&f.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=
-d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,originalSize:f.originalSize,
-position:f.position,size:f.size}}a=a===j?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",f,b(h))},stop:function(f,
-h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):[a[0],a[1]];if(b.length===
-1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);if(g in k)e=true;if(g in
-l)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):e.removeClass("ui-dialog-disabled");
-break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=this.options,b,d,e=
-this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-b,0));this.uiDialog.is(":data(resizable)")&&
-this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.8",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(a){if(this.instances.length===
-0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
-height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
-b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,
-function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
-;/*
- * jQuery UI Slider 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var b=this,a=this.options;this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");a.disabled&&this.element.addClass("ui-slider-disabled ui-disabled");
-this.range=d([]);if(a.range){if(a.range===true){this.range=d("<div></div>");if(!a.values)a.values=[this._valueMin(),this._valueMin()];if(a.values.length&&a.values.length!==2)a.values=[a.values[0],a.values[0]]}else this.range=d("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(a.range==="min"||a.range==="max")this.range.addClass("ui-slider-range-"+a.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length===0&&d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");
-if(a.values&&a.values.length)for(;d(".ui-slider-handle",this.element).length<a.values.length;)d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");this.handles=d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(c){c.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();
-else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(c){d(this).data("index.ui-slider-handle",c)});this.handles.keydown(function(c){var e=true,f=d(this).data("index.ui-slider-handle"),h,g,i;if(!b.options.disabled){switch(c.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:e=
-false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");h=b._start(c,f);if(h===false)return}break}i=b.options.step;h=b.options.values&&b.options.values.length?(g=b.values(f)):(g=b.value());switch(c.keyCode){case d.ui.keyCode.HOME:g=b._valueMin();break;case d.ui.keyCode.END:g=b._valueMax();break;case d.ui.keyCode.PAGE_UP:g=b._trimAlignValue(h+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:g=b._trimAlignValue(h-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(h===
-b._valueMax())return;g=b._trimAlignValue(h+i);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(h===b._valueMin())return;g=b._trimAlignValue(h-i);break}b._slide(c,f,g);return e}}).keyup(function(c){var e=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(c,e);b._change(c,e);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");
-this._mouseDestroy();return this},_mouseCapture:function(b){var a=this.options,c,e,f,h,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});e=this._valueMax()-this._valueMin()+1;h=this;this.handles.each(function(i){var j=Math.abs(c-h.values(i));if(e>j){e=j;f=d(this);g=i}});if(a.range===true&&this.values(1)===a.min){g+=1;f=d(this.handles[g])}if(this._start(b,
-g)===false)return false;this._mouseSliding=true;h._handleIndex=g;f.addClass("ui-state-active").focus();a=f.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-f.width()/2,top:b.pageY-a.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},
-_mouseDrag:function(b){var a=this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;
-if(this.orientation==="horizontal"){a=this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=
-this.values(a);c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var e;if(this.options.values&&this.options.values.length){e=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>e||a===1&&c<e))c=e;if(c!==this.values(a)){e=this.values();e[a]=c;b=this._trigger("slide",b,{handle:this.handles[a],value:c,values:e});this.values(a?0:1);b!==false&&this.values(a,c,true)}}else if(c!==this.value()){b=this._trigger("slide",b,{handle:this.handles[a],
-value:c});b!==false&&this.value(c)}},_stop:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("stop",b,c)},_change:function(b,a){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("change",b,c)}},value:function(b){if(arguments.length){this.options.value=
-this._trimAlignValue(b);this._refreshValue();this._change(null,0)}return this._value()},values:function(b,a){var c,e,f;if(arguments.length>1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;e=arguments[0];for(f=0;f<c.length;f+=1){c[f]=this._trimAlignValue(e[f]);this._change(null,f)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(b):this.value();
-else return this._values()},_setOption:function(b,a){var c,e=0;if(d.isArray(this.options.values))e=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(b){case "disabled":if(a){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
-this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<e;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var b=this.options.value;return b=this._trimAlignValue(b)},_values:function(b){var a,c;if(arguments.length){a=this.options.values[b];
-return a=this._trimAlignValue(a)}else{a=this.options.values.slice();for(c=0;c<a.length;c+=1)a[c]=this._trimAlignValue(a[c]);return a}},_trimAlignValue:function(b){if(b<=this._valueMin())return this._valueMin();if(b>=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},
-_refreshValue:function(){var b=this.options.range,a=this.options,c=this,e=!this._animateOff?a.animate:false,f,h={},g,i,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(k){f=(c.values(k)-c._valueMin())/(c._valueMax()-c._valueMin())*100;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[e?"animate":"css"](h,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(k===0)c.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},a.animate);
-if(k===1)c.range[e?"animate":"css"]({width:f-g+"%"},{queue:false,duration:a.animate})}else{if(k===0)c.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},a.animate);if(k===1)c.range[e?"animate":"css"]({height:f-g+"%"},{queue:false,duration:a.animate})}g=f});else{i=this.value();j=this._valueMin();l=this._valueMax();f=l!==j?(i-j)/(l-j)*100:0;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](h,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1,
-1)[e?"animate":"css"]({width:f+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[e?"animate":"css"]({width:100-f+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[e?"animate":"css"]({height:100-f+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.8"})})(jQuery);
-;/*
- * jQuery UI Tabs 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
-e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
-d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
-(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
-this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
-this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
-if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
-this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
-g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
-function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
-this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
--1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
-d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
-d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
-e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
-j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
-if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
-this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
-load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
-"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
-url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.8"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
-a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
-;/*
- * jQuery UI Datepicker 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	jquery.ui.core.js
- */
-(function(d,G){function K(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}function E(a,b){d.extend(a,b);for(var c in b)if(b[c]==
-null||b[c]==G)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.8"}});var y=(new Date).getTime();d.extend(K.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){E(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();
-f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}},
-_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&
-b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==
-""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,
-c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),
-true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}E(a.settings,e||{});
-b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);
-this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",
-this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().removeClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,
-function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().addClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:
-f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},
-e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true);E(e.settings,f);this._attachments(d(a),e);this._autoSize(e);this._setDateDatepicker(a,h);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);
-this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]?
-d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||
-a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,
-e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,
-"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==G?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},
-_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");E(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=
-d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,
-c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){d.datepicker._datepickerShowing=true;var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.effects&&
-d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this,c=d.datepicker._getBorders(a.dpDiv);a.dpDiv.empty().append(this._generateHTML(a));var e=a.dpDiv.find("iframe.ui-datepicker-cover");e.length&&e.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",
-function(){d(this).removeClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!b._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=
--1&&d(this).addClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();c=this._getNumberOfMonths(a);e=c[1];e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",17*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");a.dpDiv[(c[0]!=1||c[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,
-"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input.focus();if(a.yearshtml){var f=a.yearshtml;setTimeout(function(){f===a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);f=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},
-_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-
-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1);)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?
-b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
-_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
-0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=
-false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=
-d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);
-else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=
-a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;for(var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff,f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,
-j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=z+1<a.length&&a.charAt(z+1)==p)&&z++;return p},m=function(p){var v=o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&v?4:p=="o"?3:2)+"}");p=b.substring(s).match(p);if(!p)throw"Missing number at position "+s;s+=p[0].length;return parseInt(p[0],10)},n=function(p,v,H){p=o(p)?H:v;for(v=0;v<p.length;v++)if(b.substr(s,p[v].length).toLowerCase()==p[v].toLowerCase()){s+=p[v].length;return v+1}throw"Unknown name at position "+s;},r=function(){if(b.charAt(s)!=
-a.charAt(z))throw"Unexpected literal at position "+s;s++},s=0,z=0;z<a.length;z++)if(k)if(a.charAt(z)=="'"&&!o("'"))k=false;else r();else switch(a.charAt(z)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var w=new Date(m("@"));c=w.getFullYear();j=w.getMonth()+1;l=w.getDate();break;case "!":w=new Date((m("!")-this._ticksTo1970)/1E4);c=w.getFullYear();j=w.getMonth()+1;l=w.getDate();break;
-case "'":if(o("'"))r();else k=true;break;default:r()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}w=this._daylightSavingAdjust(new Date(c,j-1,l));if(w.getFullYear()!=c||w.getMonth()+1!=j||w.getDate()!=l)throw"Invalid date";return w},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",
-RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;
-return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,r){return i(o)?r[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",(b.getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5,3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;
-case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+=
-"0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==G?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=
-f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=
-(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,
-l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=
-a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),
-b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=
-this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+r+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(c?"w":"e")+'">'+r+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>";j=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,r,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+y+'.datepicker._hideDatepicker();">'+this._get(a,
-"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,r)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),z=
-this._get(a,"monthNames"),w=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),v=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var L=this._getDefaultDate(a),I="",C=0;C<i[0];C++){for(var M="",D=0;D<i[1];D++){var N=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",x="";if(l){x+='<div class="ui-datepicker-group';if(i[1]>1)switch(D){case 0:x+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-
-1:x+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:x+=" ui-datepicker-group-middle";t="";break}x+='">'}x+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&C==0?c?f:n:"")+(/all|right/.test(t)&&C==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,C>0||D>0,z,w)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var A=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var q=
-(t+h)%7;A+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+r[q]+'">'+s[q]+"</span></th>"}x+=A+"</tr></thead><tbody>";A=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,A);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;A=l?6:Math.ceil((t+A)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var O=0;O<A;O++){x+="<tr>";var P=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(q)+"</td>";for(t=0;t<7;t++){var F=
-p?p.apply(a.input?a.input[0]:null,[q]):[true,""],B=q.getMonth()!=g,J=B&&!H||!F[0]||k&&q<k||o&&q>o;P+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(B?" ui-datepicker-other-month":"")+(q.getTime()==N.getTime()&&g==a.selectedMonth&&a._keyEvent||L.getTime()==q.getTime()&&L.getTime()==N.getTime()?" "+this._dayOverClass:"")+(J?" "+this._unselectableClass+" ui-state-disabled":"")+(B&&!v?"":" "+F[1]+(q.getTime()==u.getTime()?" "+this._currentClass:"")+(q.getTime()==b.getTime()?" ui-datepicker-today":
-""))+'"'+((!B||v)&&F[2]?' title="'+F[2]+'"':"")+(J?"":' onclick="DP_jQuery_'+y+".datepicker._selectDay('#"+a.id+"',"+q.getMonth()+","+q.getFullYear()+', this);return false;"')+">"+(B&&!v?"&#xa0;":J?'<span class="ui-state-default">'+q.getDate()+"</span>":'<a class="ui-state-default'+(q.getTime()==b.getTime()?" ui-state-highlight":"")+(q.getTime()==u.getTime()?" ui-state-active":"")+(B?" ui-priority-secondary":"")+'" href="#">'+q.getDate()+"</a>")+"</td>";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}x+=
-P+"</tr>"}g++;if(g>11){g=0;m++}x+="</tbody></table>"+(l?"</div>"+(i[0]>0&&D==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");M+=x}I+=M}I+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");a._keyEvent=false;return I},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',
-o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&
-l)?"&#xa0;":""));a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)?r:s};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+
-a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";if(d.browser.mozilla)k+='<select class="ui-datepicker-year"><option value="'+c+'" selected="selected">'+c+"</option></select>";else{k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=
-a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,
-"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);
-c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,
-"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
-function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));
-return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new K;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.8";window["DP_jQuery_"+y]=d})(jQuery);
-;/*
- * jQuery UI Progressbar 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar
- *
- * Depends:
- *   jquery.ui.core.js
- *   jquery.ui.widget.js
- */
-(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
-this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
-this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.8"})})(jQuery);
-;/*
- * jQuery UI Effects 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/
- */
-jQuery.effects||function(f,j){function n(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
-16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return o.transparent;return o[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return n(b)}function p(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
-a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function q(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
-a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function m(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
-"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=n(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var o={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
-0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
-211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},r=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
-d){if(f.isFunction(b)){d=b;b=null}return this.queue("fx",function(){var e=f(this),g=e.attr("style")||" ",h=q(p.call(this)),l,v=e.attr("className");f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});l=q(p.call(this));e.attr("className",v);e.animate(u(h,l),a,b,function(){f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)});h=f.queue(this);l=h.splice(h.length-1,1)[0];
-h.splice(1,0,l);f.dequeue(this)})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,
-a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.8",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,
-a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",
-border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);
-return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(m(c))return this._show.apply(this,arguments);
-else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(m(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(m(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),
-b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,
-a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,
-a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==
-e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=
-g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/
-h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,
-a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
-;/*
- * jQuery UI Effects Blind 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
-g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Bounce 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
-3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
-b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Clip 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
-c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Drop 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
-"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Explode 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
-0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
-e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
-;/*
- * jQuery UI Effects Fade 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fade
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Fold 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
-10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Highlight 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
-this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Pulsate 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
-a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Scale 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
-b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
-1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
-p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
-if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
-a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
-child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
-n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Shake 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
-(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Slide 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
-var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Transfer 1.8.8
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
-b.dequeue()})})}})(jQuery);
-;
\ No newline at end of file
diff --git a/extensions/themes/silverblue/scripts/libraries/jquery.js b/extensions/themes/silverblue/scripts/libraries/jquery.js
deleted file mode 100644
index 16ad06c5a..000000000
--- a/extensions/themes/silverblue/scripts/libraries/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.2 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
-a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
-.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/extensions/themes/silverblue/scripts/libraries/jquery.rdfquery.rdfa-1.0.js b/extensions/themes/silverblue/scripts/libraries/jquery.rdfquery.rdfa-1.0.js
index 1ddb82e71..afc6993cb 100644
--- a/extensions/themes/silverblue/scripts/libraries/jquery.rdfquery.rdfa-1.0.js
+++ b/extensions/themes/silverblue/scripts/libraries/jquery.rdfquery.rdfa-1.0.js
@@ -2668,7 +2668,11 @@
       if (typeof triple === 'string') {
         triple = $.rdf.triple(triple, { namespaces: namespaces, base: base, source: triple });
       }
-      this.tripleStore.splice($.inArray(triple, this.tripleStore), 1);
+      var pos = $.inArray(triple, this.tripleStore);
+      if (pos === -1) {
+          return this;
+      }
+      this.tripleStore.splice(pos, 1);
       striples = this.subjectIndex[triple.subject];
       if (striples !== undefined) {
         striples.splice($.inArray(triple, striples), 1);
diff --git a/extensions/themes/silverblue/scripts/main.js b/extensions/themes/silverblue/scripts/main.js
index c3edd3541..3c46a4922 100644
--- a/extensions/themes/silverblue/scripts/main.js
+++ b/extensions/themes/silverblue/scripts/main.js
@@ -1,3 +1,9 @@
+/**
+ * 
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
 // namespace for script variables
 var OntoWiki = {};
 
@@ -28,24 +34,42 @@ $(document).ready(function() {
     $(document).keydown(function(e) {
         if (/view\/?|resource\/properties\/?/gi.test(window.document.baseURI)) {
             if (e.shiftKey && e.altKey) {
-                e.preventDefault();
+                var shouldPreventDefault = false;
+
                 switch(e.which) {
                     //e - 101 - edit E - 69
-                    case 69 : $('.edit-enable').trigger('click'); break;
+                    case 69 :
+                        $('.edit-enable').trigger('click');
+                        shouldPreventDefault = true;
+                        break;
                     //a - 97 - add property - A - 65
-                    case 65 : $('.property-add').trigger('click'); break;
+                    case 65 :
+                        $('.property-add').trigger('click');
+                        e.preventDefault();
+                        break;
                     //s - 115 - save S - 83
-                    case 83 : if ($('.edit-enable').hasClass('active')) { 
-                                   $('.edit.save').trigger('click'); 
-                               }; 
-                               break;
+                    case 83 :
+                        if ($('.edit-enable').hasClass('active')) {
+                            $('.edit.save').trigger('click');
+                            e.preventDefault();
+                        }; 
+                        break;
                     //c  - 99 - cancel C - 67
-                    case 67 : if ($('.edit-enable').hasClass('active')) { 
-                                  $('.edit.cancel').trigger('click'); 
-                              }; 
-                              break;
+                    case 67 :
+                        if ($('.edit-enable').hasClass('active')) {
+                            $('.edit.cancel').trigger('click');
+                            e.preventDefault();
+                        };
+                        break;
                     //l - 108 - clone L - 76
-                    case 76 : $('.clone-resource').trigger('click'); break;
+                    case 76 :
+                        $('.clone-resource').trigger('click');
+                        e.preventDefault();
+                        break;
+                }
+
+                if (shouldPreventDefault) {
+                    e.preventDefault();
                 }
             }
         }
diff --git a/extensions/themes/silverblue/scripts/serialize-php.js b/extensions/themes/silverblue/scripts/serialize-php.js
index 598a4e442..1e7121301 100644
--- a/extensions/themes/silverblue/scripts/serialize-php.js
+++ b/extensions/themes/silverblue/scripts/serialize-php.js
@@ -1,3 +1,8 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
 function serialize (mixed_value) {
     // Returns a string representation of variable (which can later be unserialized by php)
     //
diff --git a/extensions/themes/silverblue/scripts/support.js b/extensions/themes/silverblue/scripts/support.js
index ffa304dc2..1c324ff12 100644
--- a/extensions/themes/silverblue/scripts/support.js
+++ b/extensions/themes/silverblue/scripts/support.js
@@ -3,7 +3,7 @@
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
  * @copyright Copyright (c) 2009, {@link http://aksw.org AKSW}
- * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
 /**
@@ -463,8 +463,10 @@ function populateRDFauthor(data, protect, resource, graph, workingmode) {
 
                 if (workingmode == 'class') {
                     // remove all values except for type
-                    if ( !/type/gi.test(stmt._predicateLabel) ) {
+                    if ( stmt.predicateURI() !== 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' ) {
                         stmt._object.value = "";
+                    } else {
+                        stmt._hidden = true;
                     }
                 }
 
@@ -523,6 +525,12 @@ function createInstanceFromClassURI(type, dataCallback) {
                     window.setTimeout(function () {
                         window.location.href = newLocation;
                     }, 500);
+                },
+                onCancel: function () {
+                    // HACK: reload whole page after 500 ms
+                    window.setTimeout(function () {
+                        window.location.href = window.location.href;
+                    }, 500);
                 }
             });
            
@@ -565,6 +573,12 @@ function editResourceFromURI(resource) {
                     window.setTimeout(function () {
                         window.location.href = window.location.href;
                     }, 500);
+                },
+                onCancel: function () {
+                    // HACK: reload whole page after 500 ms
+                    window.setTimeout(function () {
+                        window.location.href = window.location.href;
+                    }, 500);
                 }
             });
 
diff --git a/extensions/themes/silverblue/styles/clickmenu.css b/extensions/themes/silverblue/styles/clickmenu.css
index 00c25ee80..8c583ea34 100644
--- a/extensions/themes/silverblue/styles/clickmenu.css
+++ b/extensions/themes/silverblue/styles/clickmenu.css
@@ -1,3 +1,8 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
 div.cmDiv {
 /*  border-top: 1px solid #000;*/
     border-bottom: 0.1em solid #ddd;
diff --git a/extensions/themes/silverblue/styles/default.css b/extensions/themes/silverblue/styles/default.css
index aff3f467b..1b495abaf 100644
--- a/extensions/themes/silverblue/styles/default.css
+++ b/extensions/themes/silverblue/styles/default.css
@@ -1,7 +1,10 @@
 /**
-  * default.css
-  * Ontowiki main style sheet, advanced theme
-  * @author: http://michael.haschke.biz/
+ * default.css
+ * Ontowiki main style sheet, advanced theme
+ * @author    http://michael.haschke.biz/
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ *
 
     CONTENT
     
diff --git a/extensions/themes/silverblue/styles/default.dev.css b/extensions/themes/silverblue/styles/default.dev.css
index 985a03507..9ab2d8063 100644
--- a/extensions/themes/silverblue/styles/default.dev.css
+++ b/extensions/themes/silverblue/styles/default.dev.css
@@ -1,12 +1,15 @@
 /**
-  * default.dev.css
-  * Ontowiki developer/experimental style sheet, advanced theme
-  *
-  * ATTENTION, since this file contains of development styles, it only included in
-  * debug mode. See more infos on CSS Development on
-  * http://code.google.com/p/ontowiki/wiki/CSSDevelopment
-  *
-  */
+ * default.dev.css
+ * Ontowiki developer/experimental style sheet, advanced theme
+ *
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ *
+ * ATTENTION, since this file contains of development styles, it only included in
+ * debug mode. See more infos on CSS Development on
+ * http://code.google.com/p/ontowiki/wiki/CSSDevelopment
+ *
+ */
 
 /* form stuff ****************************************************************/
 
diff --git a/extensions/themes/silverblue/styles/deprecated.dev.css b/extensions/themes/silverblue/styles/deprecated.dev.css
index d5c4e23b8..ebcba77ba 100644
--- a/extensions/themes/silverblue/styles/deprecated.dev.css
+++ b/extensions/themes/silverblue/styles/deprecated.dev.css
@@ -1,14 +1,16 @@
 /**
-  * deprecated.dev.css
-  *
-  * - it makes deprecated gui elements visible
-  * - should be only included in development environments
-  *
-  * @see http://code.google.com/p/ontowiki/wiki/CSSDevelopment
-  *
-  * @since 0.9.5
-  * @author Michael Haschke
-  */
+ * deprecated.dev.css
+ *
+ * - it makes deprecated gui elements visible
+ * - should be only included in development environments
+ *
+ * @see       http://code.google.com/p/ontowiki/wiki/CSSDevelopment
+ * @since     0.9.5
+ * @author    Michael Haschke
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ *
+ */
   
 
 
diff --git a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_ffffff_256x240.png b/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_ffffff_256x240.png
deleted file mode 100644
index 201763439..000000000
Binary files a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_ffffff_256x240.png and /dev/null differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_flat_0_aaaaaa_40x100.png b/extensions/themes/silverblue/styles/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 000000000..5b5dab2ab
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_flat_75_ffffff_40x100.png b/extensions/themes/silverblue/styles/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 000000000..ac8b229af
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_glass_55_fbf9ee_1x400.png b/extensions/themes/silverblue/styles/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 000000000..ad3d6346e
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_glass_65_ffffff_1x400.png b/extensions/themes/silverblue/styles/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 000000000..42ccba269
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_glass_75_dadada_1x400.png b/extensions/themes/silverblue/styles/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 000000000..5a46b47cb
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_glass_75_e6e6e6_1x400.png b/extensions/themes/silverblue/styles/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 000000000..86c2baa65
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_glass_95_fef1ec_1x400.png b/extensions/themes/silverblue/styles/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 000000000..4443fdc1a
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/extensions/themes/silverblue/styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/extensions/themes/silverblue/styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 000000000..7c9fa6c6e
Binary files /dev/null and b/extensions/themes/silverblue/styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_222222_256x240.png b/extensions/themes/silverblue/styles/images/ui-icons_222222_256x240.png
similarity index 91%
rename from extensions/themes/silverblue/styles/images-jqueryui/ui-icons_222222_256x240.png
rename to extensions/themes/silverblue/styles/images/ui-icons_222222_256x240.png
index b273ff111..ee039dc09 100644
Binary files a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_222222_256x240.png and b/extensions/themes/silverblue/styles/images/ui-icons_222222_256x240.png differ
diff --git a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_2e83ff_256x240.png b/extensions/themes/silverblue/styles/images/ui-icons_2e83ff_256x240.png
similarity index 91%
rename from extensions/themes/silverblue/styles/images-jqueryui/ui-icons_2e83ff_256x240.png
rename to extensions/themes/silverblue/styles/images/ui-icons_2e83ff_256x240.png
index 09d1cdc85..45e8928e5 100644
Binary files a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_2e83ff_256x240.png and b/extensions/themes/silverblue/styles/images/ui-icons_2e83ff_256x240.png differ
diff --git a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_000000_256x240.png b/extensions/themes/silverblue/styles/images/ui-icons_454545_256x240.png
similarity index 91%
rename from extensions/themes/silverblue/styles/images-jqueryui/ui-icons_000000_256x240.png
rename to extensions/themes/silverblue/styles/images/ui-icons_454545_256x240.png
index 7c211aa08..7ec70d11b 100644
Binary files a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_000000_256x240.png and b/extensions/themes/silverblue/styles/images/ui-icons_454545_256x240.png differ
diff --git a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_333333_256x240.png b/extensions/themes/silverblue/styles/images/ui-icons_888888_256x240.png
similarity index 91%
rename from extensions/themes/silverblue/styles/images-jqueryui/ui-icons_333333_256x240.png
rename to extensions/themes/silverblue/styles/images/ui-icons_888888_256x240.png
index fe079a595..5ba708c39 100644
Binary files a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_333333_256x240.png and b/extensions/themes/silverblue/styles/images/ui-icons_888888_256x240.png differ
diff --git a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_cd0a0a_256x240.png b/extensions/themes/silverblue/styles/images/ui-icons_cd0a0a_256x240.png
similarity index 91%
rename from extensions/themes/silverblue/styles/images-jqueryui/ui-icons_cd0a0a_256x240.png
rename to extensions/themes/silverblue/styles/images/ui-icons_cd0a0a_256x240.png
index 2ab019b73..7930a5580 100644
Binary files a/extensions/themes/silverblue/styles/images-jqueryui/ui-icons_cd0a0a_256x240.png and b/extensions/themes/silverblue/styles/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/extensions/themes/silverblue/styles/jquery-ui.css b/extensions/themes/silverblue/styles/jquery-ui.css
index c4de7363a..057ae9f35 100644
--- a/extensions/themes/silverblue/styles/jquery-ui.css
+++ b/extensions/themes/silverblue/styles/jquery-ui.css
@@ -1,24 +1,16 @@
-/*
- * jQuery UI CSS Framework 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
+/*! jQuery UI - v1.8.22 - 2012-07-24
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.tabs.css, jquery.ui.theme.css
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
 
 /* Layout helpers
 ----------------------------------*/
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
 .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
 
 
@@ -40,62 +32,229 @@
 /* Overlays */
 .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
 
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
 
 /*
- * jQuery UI CSS Framework 1.8.7
+ * jQuery UI Menu 1.8.22
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=sans-serif&fwDefault=normal&fsDefault=1em&cornerRadius=0px&bgColorHeader=dddddd&bgTextureHeader=01_flat.png&bgImgOpacityHeader=100&borderColorHeader=cccccc&fcHeader=000000&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=100&borderColorContent=cccccc&fcContent=333333&iconColorContent=222222&bgColorDefault=dfdfdf&bgTextureDefault=01_flat.png&bgImgOpacityDefault=75&borderColorDefault=999999&fcDefault=333333&iconColorDefault=333333&bgColorHover=eff9ff&bgTextureHover=01_flat.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=333333&iconColorHover=000000&bgColorActive=f2f2f2&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=666666&fcActive=333333&iconColorActive=333333&bgColorHighlight=f9f9f9&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=eeeeee&fcHighlight=333333&iconColorHighlight=2e83ff&bgColorError=ffbbbb&bgTextureError=01_flat.png&bgImgOpacityError=95&borderColorError=eeaaaa&fcError=000000&iconColorError=cd0a0a&bgColorOverlay=ffffff&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=50&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=50&thicknessShadow=10px&offsetTopShadow=-10px&offsetLeftShadow=-10px&cornerRadiusShadow=10px
+ * http://docs.jquery.com/UI/Menu#theming
  */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
 
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
 
 /* Component containers
 ----------------------------------*/
-.ui-widget { font-family: sans-serif; font-size: 0.8em; background-color: #fff; color:#333; }
-.window .ui-widget { font-size:1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
 .ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #cccccc; background-color:#fff; color: #333333; }
-.ui-widget-content a { color: #07c; position:relative; }
-.ui-widget-header
-{
-    border: 1px solid #cccccc;
-    background: url(../images/layout-windowtitle-gradient.png) repeat-x center #ddd;
-    color: #000000;
-    font-weight: bold;
-}
-.ui-widget-content .ui-widget-header
-{
-    width:100%;
-    position:relative; left:-0.2em; top:-0.2em;
-    border-style:none none solid none;
-    padding:0.3em 0.2em 0.2em 0.2em !important;
-    line-height:1;
-}
-.ui-widget-header a { color: #000000; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
+.ui-widget-content a { color: #222222/*{fcContent}*/; }
+.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
+.ui-widget-header a { color: #222222/*{fcHeader}*/; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #999999; background: #dfdfdf /*url(images/ui-bg_flat_75_dfdfdf_40x100.png) 50% 50% repeat-x*/; font-weight: normal; color: #333333; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #333333; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background-color: #eff9ff /*url(images/ui-bg_flat_75_eff9ff_40x100.png) 50% 50% repeat-x*/; font-weight: normal; color: #333333; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #333333; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #666666; background: #f2f2f2 /*url(images/ui-bg_flat_65_f2f2f2_40x100.png) 50% 50% repeat-x*/; font-weight: normal; color: #333333; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #333333; text-decoration: none; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121/*{fcHover}*/; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #eeeeee; background: #f9f9f9 /*url(images/ui-bg_flat_55_f9f9f9_40x100.png) 50% 50% repeat-x*/; color: #333333; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #333333; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #eeaaaa; background: #ffbbbb /*url(images/ui-bg_flat_95_ffbbbb_40x100.png) 50% 50% repeat-x*/; color: #000000; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #000000; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #000000; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
 .ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
 .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
@@ -104,15 +263,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images-jqueryui/ui-icons_333333_256x240.png); }
-.ui-dialog-titlebar .ui-icon {background-image: url(images-jqueryui/ui-icons_ffffff_256x240.png); }
-/*.ui-widget-content .ui-icon {background-image: url(images-jqueryui/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images-jqueryui/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images-jqueryui/ui-icons_333333_256x240.png); }*/
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images-jqueryui/ui-icons_000000_256x240.png); }
-/*.ui-state-active .ui-icon {background-image: url(images-jqueryui/ui-icons_333333_256x240.png); }*/
-/*.ui-state-highlight .ui-icon {background-image: url(images-jqueryui/ui-icons_2e83ff_256x240.png); }*/
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images-jqueryui/ui-icons_cd0a0a_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -296,338 +454,11 @@
 ----------------------------------*/
 
 /* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 0px; -webkit-border-top-left-radius: 0px; border-top-left-radius: 0px; }
-.ui-corner-tr { -moz-border-radius-topright: 0px; -webkit-border-top-right-radius: 0px; border-top-right-radius: 0px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; }
-.ui-corner-br { -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; }
-.ui-corner-top { -moz-border-radius-topleft: 0px; -webkit-border-top-left-radius: 0px; border-top-left-radius: 0px; -moz-border-radius-topright: 0px; -webkit-border-top-right-radius: 0px; border-top-right-radius: 0px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; }
-.ui-corner-right {  -moz-border-radius-topright: 0px; -webkit-border-top-right-radius: 0px; border-top-right-radius: 0px; -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; }
-.ui-corner-left { -moz-border-radius-topleft: 0px; -webkit-border-top-left-radius: 0px; border-top-left-radius: 0px; -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; }
-.ui-corner-all { -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; -khtml-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; -khtml-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
 
 /* Overlays */
-.ui-widget-overlay { background: #ffffff /*url(images/ui-bg_flat_0_ffffff_40x100.png) 50% 50% repeat-x*/; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -10px 0 0 -10px; padding: 10px; background: #cccccc /*url(images/ui-bg_flat_0_cccccc_40x100.png) 50% 50% repeat-x*/; opacity: .50;filter:Alpha(Opacity=50); -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; }/*
- * jQuery UI Resizable 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*
- * jQuery UI Accordion 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; overflow:hidden;}
-.ui-accordion .ui-accordion-header
-{
-    font-size: 1em;
-    padding:0.3em 0.5em 0.2em;
-    cursor: pointer; position: relative; margin:0.2em 0 0 0; zoom: 1;
-    border: 1px solid #cccccc;
-    background: url(../images/layout-windowtitle-gradient.png) repeat-x center #ddd;
-    color: #000000;
-    font-weight: bold;
-}
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion-icons .ui-accordion-header { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 0.5em; border-top: 0; margin: -1px 0 0.2em 0; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }/*
- * jQuery UI Autocomplete 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }
-.ui-autocomplete a { color:#333; overflow:hidden; border-top:dotted 1px #666; margin-top:0 !important; }
-.ui-autocomplete .ui-menu-item:first-child a { border-top:none; margin-top:1px !important; }
-.ui-autocomplete .ui-menu-item:first-child a.ui-state-hover,
-.ui-autocomplete .ui-menu-item:first-child a.ui-state-active { border-top:solid 1px #999; margin-top:0 !important; }
-.ui-autocomplete a span.resource-edit-source { float:right; font-size:0.8em; color:#666; margin-top:0.25em;}
-.ui-autocomplete a span.resource-edit-label { color:#000; }
-.ui-autocomplete a span.resource-edit-uri { display:block; clear:both; font-family: monospace; font-size: 0.8em; color:#666; width:30em;}
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*
- * jQuery UI Button 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button
-{
-    /* this is tweaked in defaul.css @3.1. */
-    display: inline-block;
-    position: relative;
-    padding: 0 !important; margin-right: .1em;
-    text-decoration: none !important;
-    cursor: pointer;
-    text-align: center;
-    zoom: 1;
-    overflow: visible;
-} /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text, input.ui-button { padding: .4em 1em !important; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*
- * jQuery UI Dialog 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0.3em; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-
-.ui-widget-content.ui-dialog { border-color:#666; }
-.ui-widget-header.ui-dialog-titlebar { color:#fff; background-color:#999; border-color:#666; }
-
-/*
- * jQuery UI Slider 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; margin:0 0.6em;}
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-
-/*
- * jQuery UI Tabs 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0 !important; background:#f3f3f3; border-color:#666; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li.ui-state-default
-{
-    background-image:url("./../images/layout-tab-gradient.png");
-    background-repeat: repeat-x;
-    background-position: left bottom;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected
-{
-    background:url("./../images/layout-tabactive-gradient.png") repeat-x right top #fff;
-    font-weight:bold;
-}
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 0.5em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*
- * jQuery UI Datepicker 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*
- * jQuery UI Progressbar 1.8.7
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:1.5em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; padding:0 !important; position:static; border-style:solid; }
\ No newline at end of file
+.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
+.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
\ No newline at end of file
diff --git a/extensions/themes/silverblue/styles/old.css b/extensions/themes/silverblue/styles/old.css
index c42ed1ad6..43b9162e3 100644
--- a/extensions/themes/silverblue/styles/old.css
+++ b/extensions/themes/silverblue/styles/old.css
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 table * {
 	vertical-align: top;
 }
diff --git a/extensions/themes/silverblue/styles/patches/ie6.clickmenu.css b/extensions/themes/silverblue/styles/patches/ie6.clickmenu.css
index c2286ade0..80375c939 100644
--- a/extensions/themes/silverblue/styles/patches/ie6.clickmenu.css
+++ b/extensions/themes/silverblue/styles/patches/ie6.clickmenu.css
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 .clickMenu ul {
 	float: left;
 	width: 100%;
diff --git a/extensions/themes/silverblue/styles/patches/ie6.css b/extensions/themes/silverblue/styles/patches/ie6.css
index bf428b30f..a14ed6f39 100644
--- a/extensions/themes/silverblue/styles/patches/ie6.css
+++ b/extensions/themes/silverblue/styles/patches/ie6.css
@@ -1,3 +1,7 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
 
 /* Zoom it, baby! (and give layout to elements) */
 
diff --git a/extensions/themes/silverblue/styles/patches/ie7.css b/extensions/themes/silverblue/styles/patches/ie7.css
index 8f185493b..956b93d68 100644
--- a/extensions/themes/silverblue/styles/patches/ie7.css
+++ b/extensions/themes/silverblue/styles/patches/ie7.css
@@ -1,3 +1,8 @@
+/**
+ * @copyright Copyright (c) 2014, {@link http://aksw.org AKSW}
+ * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
 /* Tabs */
 
 div.window .tabs {
diff --git a/extensions/translations/de/core.csv b/extensions/translations/de/core.csv
index d78cdd28a..7d8c94d19 100644
--- a/extensions/translations/de/core.csv
+++ b/extensions/translations/de/core.csv
@@ -151,6 +151,9 @@ Export Knowledge Base as Turtle;Wissensbasis als Turtle exportieren
 Export Knowledge Base as Notation 3;Wissensbasis als N3 exportieren
 Delete Knowledge Base;Wissensbasis löschen
 
+Toggle show Permalink;Permalink anzeigen/verstecken
+Toggle show Resoure Query;Resource Query anzeigen/verstecken
+
 # Wochentage
 Monday
 Tuesday
@@ -212,3 +215,11 @@ Add Resource here;Ressource hier anlegen
 Show Hidden Elements;Versteckte Ressourcen einblenden
 Hide Hidden Elements;Versteckte Ressourcen ausblenden
 
+# filter extension
+Toggle help; Hilfe (de)aktivieren
+filter_help1;Wörter die durch Leerzeichen getrennt sind müssen alle im Ergebnis enthalten sein, dabei spielt die eingegebene Reihenfolge keine Rolle.
+filter_help2;Phrasen können gesucht werden, indem die Wortgruppe in einfache Anführungszeichen gesetzt wird (Strg + #).
+filter_help3;Werden mindestens vier Buchstaben eingegeben, kann anschließend durch Sternchen '*' eine Trunkierung erfolgen.
+filter_help4;Sobald die Suche die Wörter AND oder OR enthält, muss die komplette bif:contains-Syntax benutzt werden.
+Further info;mehr Informationen
+
diff --git a/extensions/translations/en/core.csv b/extensions/translations/en/core.csv
index 8dfb7daf2..5f05901a1 100644
--- a/extensions/translations/en/core.csv
+++ b/extensions/translations/en/core.csv
@@ -100,3 +100,11 @@ Render Ressources as OntoWiki Links
 Create New Knowledge Base
 FOAFSSL;FOAF+SSL
 Forgot your password?
+
+# Filter explanation
+Toggle help
+filter_help1;Words separated by spaces must all appear, but not necessarily in the given order.
+filter_help2;Phrases can be searched by enclosing them in single quotes.
+filter_help3;It is possible to use * as wildcard, but only with a minimum of four preceding letters.
+filter_help4;As soon the search includes one of the keywords AND or OR, the full bif:contains syntax must be used.
+Further info
diff --git a/extensions/translations/fr/core.csv b/extensions/translations/fr/core.csv
new file mode 100644
index 000000000..21d46d5b6
--- /dev/null
+++ b/extensions/translations/fr/core.csv
@@ -0,0 +1,225 @@
+#
+# OntoWiki German language translation
+# Encoding:  UTF-8
+# Separator: ;
+#
+Back;Retour
+Submit;Envoyer
+Cancel;Terminer
+Save Changes;"Sauvegarder les modificitions"
+Reset Form;Reculer formulaire
+Edit Instances;TODO
+Edit Properties;TODO
+Add Property;"Ajouter propriété"
+Rendered in %1$d microseconds using %2$d SPARQL queries.;Gerendert in %1$d Mikrosekunden mit %2$d SPARQL-Anfragen.
+more;mehr
+
+moments ago;TODO
+approx. 1 minute ago;il y'a une minute
+approx. %d minutes ago;il y'a %d minutes
+approx. 1 hour ago;il y'a une heure
+approx. %d hours ago;il y'a %d heures
+approx. %d days ago;il y'a %d jours
+
+# test
+page1;Page 1
+page2;Page 2
+
+
+# Module
+Search all Knowledge Bases;Chercher tous les bases de connaissance
+Search Text;TODO
+Knowledge Bases;Bases de connaissance
+Create Knowledge Base;"Créer une base de connaissance"
+Show Hidden Knowledge Bases;"Afficher bases de connaissance cachées"
+Hide Hidden Knowledge Bases;"Cacher bases de connaissance cachées"
+Languages (Tagged Literals);Sprachen (ausgezeichnete Labels)
+none;aucun
+Classes;Classes
+Create Class;"Créer une classe"
+Show Empty Classes;Afficher des classes vides
+Hide Empty Classes;Cacher des classes vides
+Show System Classes;Afficher des classes TODO
+Hide System Classes;TODO
+Show Hidden Classes;Afficher des classes cachées
+Hide Hidden Classes;Cacher des classes cachées
+Most Popular | Most Active;Populär | Aktiv
+Rec. Changes;"Modifications"
+Rec. Comments;Commentaires
+Login;Connecter
+No matches.;Keine Entsprechungen.
+Predicates;Prädikate
+Similar Instances;"Des instances similaires"
+Instances Linking Here;Verlinkte Ressourcen
+Usage as Property;Auftreten als Prädikat
+Not implemented yet.;Noch nicht implementiert.
+Latest Changes;Aktuelle Änderungen
+Latest Discussions;Aktuelle Diskussionen
+Comments, Descriptions and Notes;Kurzbeschreibung
+Actions; Aktionen
+There are no comments, descriptions or notes on this knowledge base.; Es sind keine Kommentare, Beschreibungen oder Anmerkungen in der Wissensbasis enthalten.
+view all resources; Alle Ressourcen anzeigen
+Search for Resources;Suche nach Ressourcen
+Source;Code source
+by;von
+Objects;Objekte
+Subjects;Subjekte
+
+
+# Komponenten
+# TODO: sollten Komponenten ihre Übersetzung selbst verwalten?
+Properties;"Propriétés"
+Instances;Instances
+Calendar;Calendrier
+History;ChangeLog
+Map;Carte
+
+# application menu
+User;Utilisateur
+Register New User;Enregistrer nouvel utilisateur
+Preferences;"Préférences"
+Logout;Annuler
+View;"Aperçu"
+Edit;"Éditer"
+Extras;Extras
+SPARQL Query Editor;SPARQL-Anfrage-Editor
+File Resource Manager;Dateiressourcen-Manager
+News;Nouvelles
+Clear Cache;Vider cache
+Help;Aide
+Documentation;Documentation
+Bug Report;Fehler melden
+Version Info;Versionsinfo
+About;"Über"
+
+#Pager
+First;Erste
+Previous;Vorherige
+Next;Nächste
+Last;Letzte
+
+Create New Knowledge Base;Neue Wissensbasis anlegen
+Model URI;Modell-URI
+Create an Empty Knowledge Base; Eine leere Wissensbasis anlegen
+Base URI;Basis-URI
+Type;Typ
+Import From the Web;Aus dem WWW importieren
+Upload a File;Eine Datei hochladen
+File Type;Dateityp
+File (max. %1$sB);Datei (max. %1$sB)
+Paste Source;Quelltext eingeben
+Source Code;Quelltext
+Enter the URL where the model should be downloaded from. If you leave the field empty the model URI will be used.;Geben Sie die URL zur Modelldatei an. Wenn Sie dieses Feld leer lassen, wird stattdessen die Modell-URI benutzt.
+Location;URL zur Datei
+Instances of %1$s;Instanzen von %1$s
+Properties of %1$s;Eigenschaften von %1$s
+
+Register User;Enregister utilisateur
+Username;Nom d'utilisateur
+Email Address;Adresse e-mail
+Password;Mot de passe
+Password (repeat);"Mot de passe (répéter)"
+Unknown user identifier.;Unbekannte Benutzerkennung.
+Forgot your password?;Passwort vergessen?
+
+Predefined namespaces;Vordefinierte Namensräume
+SPARQL Options;SPARQL-Optionen
+Plain;Einfach
+Submit Query;Anfrage absenden
+result;Ergebnis
+results;Ergebnisse
+Search returned %1$d %2$s.;Die Suche lieferte %1$d %2$s. 
+Query execution took %1$d ms.;Die Bearbeitung der Anfrage dauerte %1$d ms.
+
+# Menüs
+View Resource;Regarder ressource
+Edit Resource;"Éditer ressource"
+Delete Resource;Effacer ressource
+
+List Instances;Lister les instances
+Create Instance;"Créer instance"
+Create Subclass;"Créer sous-classe"
+
+Select Knowledge Base;"Sélectionner base de connaissance"
+Configure Knowledge Base;"Configurer base de connaissance"
+Add Data to Knowledge Base;"Ajouter des données à base de connaissance"
+Export Knowledge Base as RDF/XML;Exporter base de connaissance comme RDF/XML
+Export Knowledge Base as RDF/JSON;Exporter base de connaissance comme RDF/JSON
+Export Knowledge Base as RDF/N3;Exorter base de connaissance comme RDF/N3
+Export Knowledge Base as RDF/JSON (Talis);Exporter base de connaisssance comme RDF/JSON (Talis)
+Export Knowledge Base as Turtle;Exporter base de connaissance comme Turtle
+Export Knowledge Base as Notation 3;Exporter base de connaissance comme N3
+Delete Knowledge Base;Supprimer base de connaissance
+
+Toggle show Permalink;Afficher/cacher Permalien
+Toggle show Resoure Query;Afficher/cacher Resource Query
+
+# Wochentage
+Monday;Lundi
+Tuesday;Mardi
+Wednesday;Mercredi
+Thursday;Jeudi
+Friday;Vendredi
+Saturday;Samedi
+Sunday;Dimance
+
+Add Class;Ajouter classe
+Add Instance;Ajouter instance
+
+Show Properties;"Afficher propriétés"
+
+Filter;Filter
+Combine Filters (Conjunction);Filter kombinieren (Konjunktion)
+
+Merge;Fusionner
+Visit resource on the web;Ressource im Netz aufsuchen
+
+Create instances from property value by regexp
+Similar Instances
+Rating
+Average Rating
+Your Rating
+Instances Linking Here
+Usage as Property
+Instances
+Values
+Search | OntoWiki
+Search Text
+Submit
+Search All Knowledge Bases
+Search
+Add Property
+Submit Values
+SPARQL Query Editor
+Result Options
+Table
+SPARQL Query Results XML Format
+Render Ressources as OntoWiki Links
+Create New Knowledge Base
+FOAFSSL;FOAF+SSL
+
+# explore tags module
+Explore Tags;Schlagwörter / Tag-Wolken
+Reset Explore Tags Box;Modul zurücksetzen
+Reset selected tags;Tag-Auswahl zurücksetzen
+Number of showed tags;Anzahl Tags
+Sort;Triage
+by name; par nom
+by frequency;"par quantité"
+
+# navigation module
+Number of Elements;Anzahl Ressourcen
+Toggle Elements;Spezielle Elemente
+Reset Navigation;Navigation zurücksetzen
+Add Resource here;Ajouter ressource ici
+Show Hidden Elements;Versteckte Ressourcen einblenden
+Hide Hidden Elements;Versteckte Ressourcen ausblenden
+
+# filter extension
+Toggle help; Hilfe (de)aktivieren
+filter_help1;Wörter die durch Leerzeichen getrennt sind müssen alle im Ergebnis enthalten sein, dabei spielt die eingegebene Reihenfolge keine Rolle.
+filter_help2;Phrasen können gesucht werden, indem die Wortgruppe in einfache Anführungszeichen gesetzt wird (Strg + #).
+filter_help3;Werden mindestens vier Buchstaben eingegeben, kann anschließend durch Sternchen '*' eine Trunkierung erfolgen.
+filter_help4;Sobald die Suche die Wörter AND oder OR enthält, muss die komplette bif:contains-Syntax benutzt werden.
+Further info;mehr Informationen
+
diff --git a/extensions/weblink/WeblinkPlugin.php b/extensions/weblink/WeblinkPlugin.php
index 1d5d61c78..638cccca1 100644
--- a/extensions/weblink/WeblinkPlugin.php
+++ b/extensions/weblink/WeblinkPlugin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2011-2016, {@link http://aksw.org AKSW}
  * @license   http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
diff --git a/index.php b/index.php
index e979f6804..bb423a5f6 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the {@link http://ontowiki.net OntoWiki} project.
  *
- * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
+ * @copyright Copyright (c) 2015, {@link http://aksw.org AKSW}
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
  */
 
@@ -73,27 +73,16 @@ function getEnvVar ($key)
 
 
 // PHP environment settings
-ini_set('max_execution_time', 240);
+if ((int)ini_get('max_execution_time') < 240) {
+    ini_set('max_execution_time', 240);
+}
 
 if ((int)substr(ini_get('memory_limit'), 0, -1) < 256) {
     ini_set('memory_limit', '256M');
 }
 
-/*
- * include path preparation
- */
-// init with local path in order to prefer these over system paths
-$includePath = ONTOWIKI_ROOT . 'libraries/' . PATH_SEPARATOR;
 // append local Erfurt include path
-if (file_exists(ONTOWIKI_ROOT . 'libraries/Erfurt/Erfurt/App.php')) {
-    $includePath .= ONTOWIKI_ROOT . 'libraries/Erfurt/' . PATH_SEPARATOR;
-} else if (file_exists(ONTOWIKI_ROOT . 'libraries/Erfurt/library/Erfurt/App.php')) {
-    $includePath .= ONTOWIKI_ROOT . 'libraries/Erfurt/library' . PATH_SEPARATOR;
-}
-// append system include paths
-$includePath .= get_include_path() . PATH_SEPARATOR;
-// set the include path
-set_include_path($includePath);
+require_once('vendor/autoload.php');
 
 // use default timezone from php.ini or let PHP guess it
 date_default_timezone_set(@date_default_timezone_get());
@@ -129,45 +118,12 @@ function getEnvVar ($key)
 
 define('ONTOWIKI_REWRITE', $rewriteEngineOn);
 
-/** check/include Zend_Application */
-try {
-    // use include, so we can catch it with the error handler
-    require_once 'Zend/Application.php';
-} catch (Exception $e) {
-    header('HTTP/1.1 500 Internal Server Error');
-    echo 'Fatal Error: Could not load Zend library.<br />' . PHP_EOL
-         . 'Maybe you need to install it with apt-get or with "make zend"?';
-    return;
-}
-
 // create application
 $application = new Zend_Application(
     'default',
     ONTOWIKI_ROOT . 'application/config/application.ini'
 );
 
-/** check/include OntoWiki */
-try {
-    // use include, so we can catch it with the error handler
-    require_once 'OntoWiki.php';
-} catch (Exception $e) {
-    header('HTTP/1.1 500 Internal Server Error');
-    echo 'Fatal Error: Could not load the OntoWiki Application Framework classes.<br />' . PHP_EOL
-         . 'Your installation directory seems to be screwed.';
-    return;
-}
-
-/* check/include Erfurt_App */
-try {
-    // use include, so we can catch it with the error handler
-    require_once 'Erfurt/App.php';
-} catch (Exception $e) {
-    header('HTTP/1.1 500 Internal Server Error');
-    echo 'Fatal Error: Could not load the Erfurt Framework classes.<br />' . PHP_EOL
-    . 'Maybe you should install it with apt-get or with "make deploy"?';
-    return;
-}
-
 // restore old error handler
 restore_error_handler();
 
diff --git a/libraries/ARC2/ARC2.php b/libraries/ARC2/ARC2.php
deleted file mode 100644
index d5190ad9a..000000000
--- a/libraries/ARC2/ARC2.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
- * ARC2 core class (static, not instantiated)
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-10-12
- */
-
-/* E_STRICT hack */
-if (function_exists('date_default_timezone_get')) {
-  date_default_timezone_set(@date_default_timezone_get());
-}
-
-class ARC2 {
-
-  static function getVersion() {
-    return '2010-10-12';
-  }
-
-  /*  */
-  
-  static function getIncPath($f = '') {
-    $r = realpath(dirname(__FILE__)) . '/';
-    $dirs = array(
-      'plugin' => 'plugins',
-      'trigger' => 'triggers',
-      'store' => 'store', 
-      'serializer' => 'serializers', 
-      'extractor' => 'extractors', 
-      'sparqlscript' => 'sparqlscript', 
-      'parser' => 'parsers', 
-    );
-    foreach ($dirs as $k => $dir) {
-      if (preg_match('/' . $k . '/i', $f)) {
-        return $r . $dir . '/';
-      }
-    }
-    return $r;
-  }
-  
-  static function getScriptURI() {
-    if (isset($_SERVER) && isset($_SERVER['SERVER_NAME'])) {
-      $proto = preg_replace('/^([a-z]+)\/.*$/', '\\1', strtolower($_SERVER['SERVER_PROTOCOL']));
-      $port = $_SERVER['SERVER_PORT'];
-      $server = $_SERVER['SERVER_NAME'];
-      $script = $_SERVER['SCRIPT_NAME'];
-      /* https */
-      if (($proto == 'http') && $port == 443) {
-        $proto = 'https';
-        $port = 80;
-      }
-      return $proto . '://' . $server . ($port != 80 ? ':' . $port : '') . $script;
-      /*
-      return preg_replace('/^([a-z]+)\/.*$/', '\\1', strtolower($_SERVER['SERVER_PROTOCOL'])) . 
-        '://' . $_SERVER['SERVER_NAME'] .
-        ($_SERVER['SERVER_PORT'] != 80 ? ':' . $_SERVER['SERVER_PORT'] : '') .
-        $_SERVER['SCRIPT_NAME'];
-      */
-    }
-    elseif (isset($_SERVER['SCRIPT_FILENAME'])) {
-      return 'file://' . realpath($_SERVER['SCRIPT_FILENAME']);
-    }
-    return 'http://localhost/unknown_path';
-  }
-
-  static function getRequestURI() {
-    if (isset($_SERVER) && isset($_SERVER['REQUEST_URI'])) {
-      return preg_replace('/^([a-z]+)\/.*$/', '\\1', strtolower($_SERVER['SERVER_PROTOCOL'])) . 
-        '://' . $_SERVER['SERVER_NAME'] .
-        ($_SERVER['SERVER_PORT'] != 80 ? ':' . $_SERVER['SERVER_PORT'] : '') .
-        $_SERVER['REQUEST_URI'];
-    }
-    return ARC2::getScriptURI();
-  }
-  
-  static function inc($f, $path = '') {
-    $prefix = 'ARC2';
-    if (preg_match('/^([^\_]+)\_(.*)$/', $f, $m)) {
-      $prefix = $m[1];
-      $f = $m[2];
-    }
-    $inc_path = $path ? $path : ARC2::getIncPath($f);
-    $path = $inc_path . $prefix . '_' . urlencode($f) . '.php';
-    if (file_exists($path)) return include_once($path);
-    /* safe-mode hack */
-    if (@include_once($path)) return 1;
-    /* try other path */
-    if ($prefix != 'ARC2') {
-      $path = $inc_path . strtolower($prefix) . '/' . $prefix . '_' . urlencode($f) . '.php';
-      if (file_exists($path)) return include_once($path);
-      /* safe-mode hack */
-      if (@include_once($path)) return 1;
-    }
-    return 0;
-  }
-  
-  /*  */
-
-  static function mtime(){
-    list($msec, $sec) = explode(" ", microtime());
-    return ((float)$msec + (float)$sec);
-  }
-  
-  static function x($re, $v, $options = 'si') {
-    return preg_match("/^\s*" . $re . "(.*)$/" . $options, $v, $m) ? $m : false;
-  }
-
-  /*  */
-
-  static function getFormat($val, $mtype = '', $ext = '') {
-    ARC2::inc('getFormat');
-    return ARC2_getFormat($val, $mtype, $ext);
-  }
-  
-  static function getPreferredFormat($default = 'plain') {
-    ARC2::inc('getPreferredFormat');
-    return ARC2_getPreferredFormat($default);
-  }
-  
-  /*  */
-  
-  static function toUTF8($v) {
-    if (urlencode($v) === $v) return $v;
-    //if (utf8_decode($v) == $v) return $v;
-    $v = (strpos(utf8_decode(str_replace('?', '', $v)), '?') === false) ? utf8_decode($v) : $v;
-    /* custom hacks, mainly caused by bugs in PHP's json_decode */
-    $mappings = array(
-      '%18' => '‘',
-      '%19' => '’',
-      '%1C' => '“',
-      '%1D' => '”',
-      '%1E' => '„',
-      '%10' => '‐',
-      '%12' => '−',
-      '%13' => '–',
-      '%14' => '—',
-      '%26' => '&',
-    );
-    $froms = array_keys($mappings);
-    $tos = array_values($mappings);
-    foreach ($froms as $i => $from) $froms[$i] = urldecode($from);
-    $v = str_replace($froms, $tos, $v);
-    /* utf8 tweaks */
-    return preg_replace_callback('/([\x00-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3}|[\xf8-\xfb][\x80-\xbf]{4}|[\xfc-\xfd][\x80-\xbf]{5}|[^\x00-\x7f])/', array('ARC2', 'getUTF8Char'), $v);
-  }
-  
-  static function getUTF8Char($v) {
-    $val = $v[1];
-    if (strlen(trim($val)) === 1) return utf8_encode($val);
-    if (preg_match('/^([\x00-\x7f])(.+)/', $val, $m)) return $m[1] . ARC2::toUTF8($m[2]);
-    return $val;
-  }
-
-  /*  */
-
-  static function splitURI($v) {
-    /* the following namespaces may lead to conflated URIs,
-     * we have to set the split position manually
-    */
-    if (strpos($v, 'www.w3.org')) {
-      $specials = array(
-        'http://www.w3.org/XML/1998/namespace',
-        'http://www.w3.org/2005/Atom',
-        'http://www.w3.org/1999/xhtml',
-      );
-      foreach ($specials as $ns) {
-        if (strpos($v, $ns) === 0) {
-          $local_part = substr($v, strlen($ns));
-          if (!preg_match('/^[\/\#]/', $local_part)) {
-            return array($ns, $local_part);
-          }
-        }
-      }
-    }
-    /* auto-splitting on / or # */
-    //$re = '^(.*?)([A-Z_a-z][-A-Z_a-z0-9.]*)$';
-    if (preg_match('/^(.*[\/\#])([^\/\#]+)$/', $v, $m)) return array($m[1], $m[2]);
-    /* auto-splitting on last special char, e.g. urn:foo:bar */
-    if (preg_match('/^(.*[\:\/])([^\:\/]+)$/', $v, $m)) return array($m[1], $m[2]);
-    return array($v, '');
-  }
-  
-  /*  */
-
-  static function getSimpleIndex($triples, $flatten_objects = 1, $vals = '') {
-    $r = array();
-    foreach ($triples as $t) {
-      $skip_t = 0;
-      foreach (array('s', 'p', 'o') as $term) {
-        $$term = $t[$term];
-        /* template var */
-        if (isset($t[$term . '_type']) && ($t[$term . '_type'] == 'var')) {
-          $val = isset($vals[$$term]) ? $vals[$$term] : '';
-          $skip_t = isset($vals[$$term]) ? $skip_t : 1;
-          $type = '';
-          $type = !$type && isset($vals[$$term . ' type']) ? $vals[$$term . ' type'] : $type;
-          $type = !$type && preg_match('/^\_\:/', $val) ? 'bnode' : $type;
-          if ($term == 'o') {
-            $type = !$type && (preg_match('/\s/s', $val) || !preg_match('/\:/', $val)) ? 'literal' : $type;
-            $type = !$type && !preg_match('/[\/]/', $val) ? 'literal' : $type;
-          }
-          $type = !$type ? 'uri' : $type;
-          $t[$term . '_type'] =  $type;
-          $$term = $val;
-        }
-      }
-      if ($skip_t) {
-        continue;
-      }
-      if (!isset($r[$s])) $r[$s] = array();
-      if (!isset($r[$s][$p])) $r[$s][$p] = array();
-      if ($flatten_objects) {
-        if (!in_array($o, $r[$s][$p])) $r[$s][$p][] = $o;
-      }
-      else {
-        $o = array('value' => $o);
-        foreach (array('lang', 'type', 'datatype') as $suffix) {
-          if (isset($t['o_' . $suffix]) && $t['o_' . $suffix]) {
-            $o[$suffix] = $t['o_' . $suffix];
-          }
-          elseif (isset($t['o ' . $suffix]) && $t['o ' . $suffix]) {
-            $o[$suffix] = $t['o ' . $suffix];
-          }
-        }
-        if (!in_array($o, $r[$s][$p])) {
-          $r[$s][$p][] = $o;
-        }
-      }
-    }
-    return $r;
-  }
-  
-  static function getTriplesFromIndex($index) {
-    $r = array();
-    foreach ($index as $s => $ps) {
-      foreach ($ps as $p => $os) {
-        foreach ($os as $o) {
-          $r[] = array(
-            's' => $s,
-            'p' => $p,
-            'o' => $o['value'],
-            's_type' => preg_match('/^\_\:/', $s) ? 'bnode' : 'uri',
-            'o_type' => $o['type'],
-            'o_datatype' => isset($o['datatype']) ? $o['datatype'] : '',
-            'o_lang' => isset($o['lang']) ? $o['lang'] : '',
-          );
-        }
-      }
-    }
-    return $r;
-  }
-
-  static function getMergedIndex() {
-    $r = array();
-    foreach (func_get_args() as $index) {
-      foreach ($index as $s => $ps) {
-        if (!isset($r[$s])) $r[$s] = array();
-        foreach ($ps as $p => $os) {
-          if (!isset($r[$s][$p])) $r[$s][$p] = array();
-          foreach ($os as $o) {
-            if (!in_array($o, $r[$s][$p])) {
-              $r[$s][$p][] = $o;
-            }
-          }
-        }
-      }
-    }
-    return $r;
-  }
-  
-  static function getCleanedIndex() {/* removes triples from a given index */
-    $indexes = func_get_args();
-    $r = $indexes[0];
-    for ($i = 1, $i_max = count($indexes); $i < $i_max; $i++) {
-      $index = $indexes[$i];
-      foreach ($index as $s => $ps) {
-        if (!isset($r[$s])) continue;
-        foreach ($ps as $p => $os) {
-          if (!isset($r[$s][$p])) continue;
-          $r_os = $r[$s][$p];
-          $new_os = array();
-          foreach ($r_os as $r_o) {
-            $r_o_val = is_array($r_o) ? $r_o['value'] : $r_o;
-            $keep = 1;
-            foreach ($os as $o) {
-              $del_o_val = is_array($o) ? $o['value'] : $o;
-              if ($del_o_val == $r_o_val) {
-                $keep = 0;
-                break;
-              }
-            }
-            if ($keep) {
-              $new_os[] = $r_o;
-            }
-          }
-          if ($new_os) {
-            $r[$s][$p] = $new_os;
-          }
-          else {
-            unset($r[$s][$p]);
-          }
-        }
-      }
-    }
-    /* check r */
-    $has_data = 0;
-    foreach ($r as $s => $ps) {
-      if ($ps) {
-        $has_data = 1;
-        break;
-      }
-    }
-    return $has_data ? $r : array();
-  }
-  
-  /*  */
-
-  static function getStructType($v) {
-    /* string */
-    if (is_string($v)) return 'string';
-    /* flat array, numeric keys */
-    if (in_array(0, array_keys($v))) {/* numeric keys */
-      /* simple array */
-      if (!is_array($v[0])) return 'array';
-      /* triples */
-      //if (isset($v[0]) && isset($v[0]['s']) && isset($v[0]['p'])) return 'triples';
-      if (in_array('p', array_keys($v[0]))) return 'triples';
-    }
-    /* associative array */
-    else {
-      /* index */
-      foreach ($v as $s => $ps) {
-        if (!is_array($ps)) break;
-        foreach ($ps as $p => $os) {
-          if (!is_array($os) || !is_array($os[0])) break;
-          if (in_array('value', array_keys($os[0]))) return 'index';
-        }
-      }
-    }
-    /* array */
-    return 'array';
-  }
-
-  /*  */
-
-  static function getComponent($name, $a = '', $caller = '') {
-    ARC2::inc($name);
-    $prefix = 'ARC2';
-    if (preg_match('/^([^\_]+)\_(.+)$/', $name, $m)) {
-      $prefix = $m[1];
-      $name = $m[2];
-    }
-    $cls = $prefix . '_' . $name;
-    if (!$caller) $caller = new stdClass();
-    return new $cls($a, $caller);
-  }
-  
-  /* resource */
-
-  static function getResource($a = '') {
-    return ARC2::getComponent('Resource', $a);
-  }
-
-  /* reader */
-
-  static function getReader($a = '') {
-    return ARC2::getComponent('Reader', $a);
-  }
-
-  /* parsers */
-
-  static function getParser($prefix, $a = '') {
-    return ARC2::getComponent($prefix . 'Parser', $a);
-  }
-
-  static function getRDFParser($a = '') {
-    return ARC2::getParser('RDF', $a);
-  }
-
-  static function getRDFXMLParser($a = '') {
-    return ARC2::getParser('RDFXML', $a);
-  }
-
-  static function getTurtleParser($a = '') {
-    return ARC2::getParser('Turtle', $a);
-  }
-
-  static function getRSSParser($a = '') {
-    return ARC2::getParser('RSS', $a);
-  }
-
-  static function getSemHTMLParser($a = '') {
-    return ARC2::getParser('SemHTML', $a);
-  }
-
-  static function getSPARQLParser($a = '') {
-    return ARC2::getComponent('SPARQLParser', $a);
-  }
-
-  static function getSPARQLPlusParser($a = '') {
-    return ARC2::getParser('SPARQLPlus', $a);
-  }
-
-  static function getSPARQLXMLResultParser($a = '') {
-    return ARC2::getParser('SPARQLXMLResult', $a);
-  }
-
-  static function getJSONParser($a = '') {
-    return ARC2::getParser('JSON', $a);
-  }
-
-  static function getSGAJSONParser($a = '') {
-    return ARC2::getParser('SGAJSON', $a);
-  }
-
-  static function getCBJSONParser($a = '') {
-    return ARC2::getParser('CBJSON', $a);
-  }
-
-  static function getSPARQLScriptParser($a = '') {
-    return ARC2::getParser('SPARQLScript', $a);
-  }
-
-  /* store */
-
-  static function getStore($a = '', $caller = '') {
-    return ARC2::getComponent('Store', $a, $caller);
-  }
-
-  static function getStoreEndpoint($a = '', $caller = '') {
-    return ARC2::getComponent('StoreEndpoint', $a, $caller);
-  }
-
-  static function getRemoteStore($a = '', $caller = '') {
-    return ARC2::getComponent('RemoteStore', $a, $caller);
-  }
-
-  static function getMemStore($a = '') {
-    return ARC2::getComponent('MemStore', $a);
-  }
-  
-  /* serializers */
-
-  static function getSer($prefix, $a = '') {
-    return ARC2::getComponent($prefix . 'Serializer', $a);
-  }
-
-  static function getTurtleSerializer($a = '') {
-    return ARC2::getSer('Turtle', $a);
-  }
-
-  static function getRDFXMLSerializer($a = '') {
-    return ARC2::getSer('RDFXML', $a);
-  }
-
-  static function getNTriplesSerializer($a = '') {
-    return ARC2::getSer('NTriples', $a);
-  }
-
-  static function getRDFJSONSerializer($a = '') {
-    return ARC2::getSer('RDFJSON', $a);
-  }
-
-  static function getPOSHRDFSerializer($a = '') {/* deprecated */
-    return ARC2::getSer('POSHRDF', $a);
-  }
-
-  static function getMicroRDFSerializer($a = '') {
-    return ARC2::getSer('MicroRDF', $a);
-  }
-
-  static function getRSS10Serializer($a = '') {
-    return ARC2::getSer('RSS10', $a);
-  }
-
-  /* sparqlscript */
-
-  static function getSPARQLScriptProcessor($a = '') {
-    return ARC2::getComponent('SPARQLScriptProcessor', $a);
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/ARC2_Class.php b/libraries/ARC2/ARC2_Class.php
deleted file mode 100644
index 7099de446..000000000
--- a/libraries/ARC2/ARC2_Class.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * ARC2 base class
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-10-12
- */
-
-class ARC2_Class {
-  
-  function __construct($a, &$caller) {
-    $this->a = is_array($a) ? $a : array();
-    $this->caller = $caller;
-    $this->__init();
-  }
-  
-  function __init() {/* base, time_limit */
-    if (!$_POST && isset($GLOBALS['HTTP_RAW_POST_DATA'])) parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $_POST); /* php5 bug */
-    $this->inc_path = ARC2::getIncPath();
-    $this->ns_count = 0;
-    $rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->nsp = array($rdf => 'rdf');
-    $this->used_ns = array($rdf);
-    $this->ns = array_merge(array('rdf' => $rdf), $this->v('ns', array(), $this->a));
-
-    $this->base = $this->v('base', ARC2::getRequestURI(), $this->a);
-    $this->errors = array();
-    $this->warnings = array();
-    $this->adjust_utf8 = $this->v('adjust_utf8', 0, $this->a);
-    $this->max_errors = $this->v('max_errors', 25, $this->a);
-  }
-
-  /*  */
-  
-  function v($name, $default = false, $o = false) {/* value if set */
-    if ($o === false) $o = $this;
-    if (is_array($o)) {
-      return isset($o[$name]) ? $o[$name] : $default;
-    }
-    return isset($o->$name) ? $o->$name : $default;
-  }
-  
-  function v1($name, $default = false, $o = false) {/* value if 1 (= not empty) */
-    if ($o === false) $o = $this;
-    if (is_array($o)) {
-      return (isset($o[$name]) && $o[$name]) ? $o[$name] : $default;
-    }
-    return (isset($o->$name) && $o->$name) ? $o->$name : $default;
-  }
-  
-  function m($name, $a = false, $default = false, $o = false) {/* call method */
-    if ($o === false) $o = $this;
-    return method_exists($o, $name) ? $o->$name($a) : $default;
-  }
-
-  /*  */
-
-  function camelCase($v, $lc_first = 0, $keep_boundaries = 0) {
-    $r = ucfirst($v);
-    while (preg_match('/^(.*)[^a-z0-9](.*)$/si', $r, $m)) {
-      /* don't fuse 2 upper-case chars */
-      if ($keep_boundaries && $m[1]) {
-        $boundary = substr($m[1], -1);
-        if (strtoupper($boundary) == $boundary) $m[1] .= 'CAMELCASEBOUNDARY';
-      }
-      $r = $m[1] . ucfirst($m[2]);
-    }
-    $r = str_replace('CAMELCASEBOUNDARY', '_', $r);
-    if ((strlen($r) > 1) && $lc_first && !preg_match('/[A-Z]/', $r[1])) $r = strtolower($r[0]) . substr($r, 1);
-    return $r;
-  }
-
-  function deCamelCase($v, $uc_first = 0) {
-    $r = str_replace('_', ' ', $v);
-    $r = preg_replace('/([a-z0-9])([A-Z])/e', '"\\1 " . strtolower("\\2")', $r);
-    return $uc_first ? ucfirst($r) : $r;
-  }
-
-  /**
-   * Tries to extract a somewhat human-readable label from a URI.
-   */
-
-  function extractTermLabel($uri, $loops = 0) {
-    list($ns, $r) = $this->splitURI($uri);
-    $r = $this->deCamelCase($this->camelCase($r, 1, 1));
-    /* typical RDF non-info URI */
-    if (($loops < 1) && preg_match('/^(self|it|this|me)$/i', $r)) {
-      return $this->extractTermLabel(preg_replace('/\#.+$/', '', $uri), $loops + 1);
-    }
-    /* trailing hash or slash */
-    if ($uri && !$r && ($loops < 2)) {
-      return $this->extractTermLabel(preg_replace('/[\#\/]$/', '', $uri), $loops + 1);
-    }
-    /* a de-camel-cased URL (will look like "www example com") */
-    if (preg_match('/^www (.+ [a-z]{2,4})$/', $r, $m)) {
-      return $this->getPrettyURL($uri);
-    }
-    return $r;
-  }
-
-  /**
-   * Generates a less ugly in-your-face URL.
-   */
-
-  function getPrettyURL($r) {
-    $r = rtrim($r, '/');
-    $r = preg_replace('/^https?\:\/\/(www\.)?/', '', $r);
-    return $r;
-  }
-
-  /*  */
-  
-  function addError($v) {
-    if (!in_array($v, $this->errors)) {
-      $this->errors[] = $v;
-    }
-    if ($this->caller && method_exists($this->caller, 'addError')) {
-      $glue = strpos($v, ' in ') ? ' via ' : ' in ';
-      $this->caller->addError($v . $glue . get_class($this));
-    }
-    if (count($this->errors) > $this->max_errors) {
-      die('Too many errors (limit: ' . $this->max_errors . '): ' . print_r($this->errors, 1));
-    }
-    return false;
-  }
-  
-  function getErrors() {
-    return $this->errors;
-  }
-  
-  function getWarnings() {
-    return $this->warnings;
-  }
-
-  function resetErrors() {
-    $this->errors = array();
-    if ($this->caller && method_exists($this->caller, 'resetErrors')) {
-      $this->caller->resetErrors();
-    }
-  }
-  
-  /*  */
-  
-  function splitURI($v) {
-    return ARC2::splitURI($v);
-  }
-
-  /*  */
-
-  function getPName($v, $connector = ':') {
-    /* is already a pname */
-    $ns = $this->getPNameNamespace($v, $connector);
-    if ($ns) {
-      if (!in_array($ns, $this->used_ns)) $this->used_ns[] = $ns;
-      return $v;
-    }
-    /* new pname */
-    $parts = $this->splitURI($v);
-    if ($parts) {
-      /* known prefix */
-      foreach ($this->ns as $prefix => $ns) {
-        if ($parts[0] == $ns) {
-          if (!in_array($ns, $this->used_ns)) $this->used_ns[] = $ns;
-          return $prefix . $connector . $parts[1];
-        }
-      }
-      /* new prefix */
-      $prefix = $this->getPrefix($parts[0]);
-      return $prefix . $connector . $parts[1];
-    }
-    return $v;
-  }
-
-  function getPNameNamespace($v, $connector = ':') {
-    $re = '/^([a-z0-9\_\-]+)\:([a-z0-9\_\-\.\%]+)$/i';
-    if ($connector != ':') {
-      $connectors = array('\:', '\-', '\_', '\.');
-      $chars = join('', array_diff($connectors, array($connector)));
-      $re = '/^([a-z0-9' . $chars . ']+)\\' . $connector . '([a-z0-9\_\-\.\%]+)$/i';
-    }
-    if (!preg_match($re, $v, $m)) return 0;
-    if (!isset($this->ns[$m[1]])) return 0;
-    return $this->ns[$m[1]];
-  }
-
-  function getPrefix($ns) {
-    if (!isset($this->nsp[$ns])) {
-      $this->ns['ns' . $this->ns_count] = $ns;
-      $this->nsp[$ns] = 'ns' . $this->ns_count;
-      $this->ns_count++;
-    }
-    if (!in_array($ns, $this->used_ns)) $this->used_ns[] = $ns;
-    return $this->nsp[$ns];
-  }
-
-  function expandPName($v, $connector = ':') {
-    $re = '/^([a-z0-9\_\-]+)\:([a-z0-9\_\-\.\%]+)$/i';
-    if ($connector != ':') {
-      $connectors = array(':', '-', '_', '.');
-      $chars = '\\' . join('\\', array_diff($connectors, array($connector)));
-      $re = '/^([a-z0-9' . $chars . ']+)\\' . $connector . '([a-z0-9\_\-\.\%]+)$/Ui';
-    }
-    if (preg_match($re, $v, $m) && isset($this->ns[$m[1]])) {
-      return $this->ns[$m[1]] . $m[2];
-    }
-    return $v;
-  }
-
-  function expandPNames($index) {
-    $r = array();
-    foreach ($index as $s => $ps) {
-      $s = $this->expandPName($s);
-      $r[$s] = array();
-      foreach ($ps as $p => $os) {
-        $p = $this->expandPName($p);
-        if (!is_array($os)) $os = array($os);
-        foreach ($os as $i => $o) {
-          if (!is_array($o)) {
-            $o_val = $this->expandPName($o);
-            $o_type = preg_match('/^[a-z]+\:[^\s\<\>]+$/si', $o_val) ? 'uri' : 'literal';
-            $o = array('value' => $o_val, 'type' => $o_type);
-          }
-          $os[$i] = $o;
-        }
-        $r[$s][$p] = $os;
-      }
-    }
-    return $r;
-  }
-
-  /*  */
-  
-  function calcURI($path, $base = "") {
-    /* quick check */
-    if (preg_match("/^[a-z0-9\_]+\:/i", $path)) {/* abs path or bnode */
-      return $path;
-    }
-    if (preg_match('/^\$\{.*\}/', $path)) {/* placeholder, assume abs URI */
-      return $path;
-    }
-    if (preg_match("/^\/\//", $path)) {/* net path, assume http */
-      return 'http:' . $path;
-    }
-    /* other URIs */
-    $base = $base ? $base : $this->base;
-    $base = preg_replace('/\#.*$/', '', $base);
-    if ($path === true) {/* empty (but valid) URIref via turtle parser: <> */
-      return $base;
-    }
-    $path = preg_replace("/^\.\//", '', $path);
-    $root = preg_match('/(^[a-z0-9]+\:[\/]{1,3}[^\/]+)[\/|$]/i', $base, $m) ? $m[1] : $base; /* w/o trailing slash */
-    $base .= ($base == $root) ? '/' : '';
-    if (preg_match('/^\//', $path)) {/* leading slash */
-      return $root . $path;
-    }
-    if (!$path) {
-      return $base;
-    }
-    if (preg_match('/^([\#\?])/', $path, $m)) {
-      return preg_replace('/\\' .$m[1]. '.*$/', '', $base) . $path;
-    }
-    if (preg_match('/^(\&)(.*)$/', $path, $m)) {/* not perfect yet */
-      return preg_match('/\?/', $base) ? $base . $m[1] . $m[2] : $base . '?' . $m[2];
-    }
-    if (preg_match("/^[a-z0-9]+\:/i", $path)) {/* abs path */
-      return $path;
-    }
-    /* rel path: remove stuff after last slash */
-    $base = substr($base, 0, strrpos($base, '/')+1);
-    /* resolve ../ */
-    while (preg_match('/^(\.\.\/)(.*)$/', $path, $m)) {
-      $path = $m[2];
-      $base = ($base == $root.'/') ? $base : preg_replace('/^(.*\/)[^\/]+\/$/', '\\1', $base);
-    }
-    return $base . $path;
-  }
-  
-  /*  */
-  
-  function calcBase($path) {
-    $r = $path;
-    $r = preg_replace('/\#.*$/', '', $r);/* remove hash */
-    $r = preg_replace('/^\/\//', 'http://', $r);/* net path (//), assume http */
-    if (preg_match('/^[a-z0-9]+\:/', $r)) {/* scheme, abs path */
-      while (preg_match('/^(.+\/)(\.\.\/.*)$/U', $r, $m)) {
-        $r = $this->calcURI($m[1], $m[2]);
-      }
-      return $r;
-    }
-    return 'file://' . realpath($r);/* real path */
-  }
-
-  /*  */
-
-  function getResource($uri, $store_or_props = '') {
-    $res = ARC2::getResource($this->a);
-    $res->setURI($uri);
-    if (is_array($store_or_props)) {
-      $res->setProps($store_or_props);
-    }
-    else {
-      $res->setStore($store_or_props);
-    }
-    return $res;
-  }
-  
-  function toIndex($v) {
-    if (is_array($v)) {
-      if (isset($v[0]) && isset($v[0]['s'])) return ARC2::getSimpleIndex($v, 0);
-      return $v;
-    }
-    $parser = ARC2::getRDFParser($this->a);
-    if ($v && !preg_match('/\s/', $v)) {/* assume graph URI */
-      $parser->parse($v);
-    }
-    else {
-      $parser->parse('', $v);
-    }
-    return $parser->getSimpleIndex(0);
-  }
-
-  function toTriples($v) {
-    if (is_array($v)) {
-      if (isset($v[0]) && isset($v[0]['s'])) return $v;
-      return ARC2::getTriplesFromIndex($v);
-    }
-    $parser = ARC2::getRDFParser($this->a);
-    if ($v && !preg_match('/\s/', $v)) {/* assume graph URI */
-      $parser->parse($v);
-    }
-    else {
-      $parser->parse('', $v);
-    }
-    return $parser->getTriples();
-  }
-
-  /*  */
-
-  function toNTriples($v, $ns = '', $raw = 0) {
-    ARC2::inc('NTriplesSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_NTriplesSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return (isset($v[0]) && isset($v[0]['s'])) ? $ser->getSerializedTriples($v, $raw) : $ser->getSerializedIndex($v, $raw);
-  }
-  
-  function toTurtle($v, $ns = '', $raw = 0) {
-    ARC2::inc('TurtleSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_TurtleSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return (isset($v[0]) && isset($v[0]['s'])) ? $ser->getSerializedTriples($v, $raw) : $ser->getSerializedIndex($v, $raw);
-  }
-  
-  function toRDFXML($v, $ns = '', $raw = 0) {
-    ARC2::inc('RDFXMLSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_RDFXMLSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return (isset($v[0]) && isset($v[0]['s'])) ? $ser->getSerializedTriples($v, $raw) : $ser->getSerializedIndex($v, $raw);
-  }
-
-  function toRDFJSON($v, $ns = '') {
-    ARC2::inc('RDFJSONSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_RDFJSONSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return (isset($v[0]) && isset($v[0]['s'])) ? $ser->getSerializedTriples($v) : $ser->getSerializedIndex($v);
-  }
-
-  function toRSS10($v, $ns = '') {
-    ARC2::inc('RSS10Serializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_RSS10Serializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return (isset($v[0]) && isset($v[0]['s'])) ? $ser->getSerializedTriples($v) : $ser->getSerializedIndex($v);
-  }
-
-  function toLegacyXML($v, $ns = '') {
-    ARC2::inc('LegacyXMLSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_LegacyXMLSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return $ser->getSerializedArray($v);
-  }
-
-  function toLegacyJSON($v, $ns = '') {
-    ARC2::inc('LegacyJSONSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_LegacyJSONSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return $ser->getSerializedArray($v);
-  }
-
-  function toLegacyHTML($v, $ns = '') {
-    ARC2::inc('LegacyHTMLSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $ser = new ARC2_LegacyHTMLSerializer(array_merge($this->a, array('ns' => $ns)), $this);
-    return $ser->getSerializedArray($v);
-  }
-
-  function toHTML($v, $ns = '', $label_store = '') {
-    ARC2::inc('MicroRDFSerializer');
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $conf = array_merge($this->a, array('ns' => $ns));
-    if ($label_store) $conf['label_store'] = $label_store;
-    $ser = new ARC2_MicroRDFSerializer($conf, $this);
-    return (isset($v[0]) && isset($v[0]['s'])) ? $ser->getSerializedTriples($v) : $ser->getSerializedIndex($v);
-  }
-
-  /*  */
-
-  function getFilledTemplate($t, $vals, $g = '') {
-    $parser = ARC2::getTurtleParser();
-    $parser->parse($g, $this->getTurtleHead() . $t);
-    return $parser->getSimpleIndex(0, $vals);
-  }
-  
-  function getTurtleHead() {
-    $r = '';
-    $ns = $this->v('ns', array(), $this->a);
-    foreach ($ns as $k => $v) {
-      $r .= "@prefix " . $k . ": <" .$v. "> .\n";
-    }
-    return $r;
-  }
-  
-  function completeQuery($q, $ns = '') {
-    if (!$ns) $ns = isset($this->a['ns']) ? $this->a['ns'] : array();
-    $added_prefixes = array();
-    $prologue = '';
-    foreach ($ns as $k => $v) {
-      $k = rtrim($k, ':');
-      if (in_array($k, $added_prefixes)) continue;
-      if (preg_match('/(^|\s)' . $k . ':/s', $q) && !preg_match('/PREFIX\s+' . $k . '\:/is', $q)) {
-        $prologue .= "\n" . 'PREFIX ' . $k . ': <' . $v . '>';
-      }
-      $added_prefixes[] = $k;
-    }
-    return $prologue . "\n" . $q;
-  }
-
-  /*  */
-
-  function toUTF8($str) {
-    return $this->adjust_utf8 ? ARC2::toUTF8($str) : $str;
-  }
-
-  function toDataURI($str) {
-    return 'data:text/plain;charset=utf-8,' . rawurlencode($str);
-  }
-
-  function fromDataURI($str) {
-    return str_replace('data:text/plain;charset=utf-8,', '', rawurldecode($str));
-  }
-
-  /* prevent SQL injections via SPARQL REGEX */
-
-  function checkRegex($str) {
-    return addslashes($str); // @@todo extend
-  }
-  
-  /* Microdata methods */
-
-  function getMicrodataAttrs($id, $type = '') {
-    $type = $type ? $this->expandPName($type) : $this->expandPName('owl:Thing');
-    return 'itemscope="" itemtype="' . htmlspecialchars($type) . '" itemid="' . htmlspecialchars($id) . '"';
-  }
-
-  function mdAttrs($id, $type = '') {
-    return $this->getMicrodataAttrs($id, $type);
-  }
-
-  /* central DB query hook */
-
-  function queryDB($sql, $con, $log_errors = 0) {
-    $t1 = ARC2::mtime();
-    $r = mysql_query($sql, $con);
-    $t2 = ARC2::mtime() - $t1;
-    if ($t2 > 1) {
-      //echo "\n needed " . $t2 . ' secs for ' . $sql;
-    }
-    if ($log_errors && ($er = mysql_error($con))) $this->addError($er);
-    return $r;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/ARC2_Reader.php b/libraries/ARC2/ARC2_Reader.php
deleted file mode 100644
index c3e19d7a9..000000000
--- a/libraries/ARC2/ARC2_Reader.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * ARC2 Web Client
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-07-06
-*/
-
-ARC2::inc('Class');
-
-class ARC2_Reader extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* inc_path, proxy_host, proxy_port, proxy_skip, http_accept_header, http_user_agent_header, max_redirects */
-    parent::__init();
-    $this->http_method = $this->v('http_method', 'GET', $this->a);
-    $this->message_body = $this->v('message_body', '', $this->a);;
-    $this->http_accept_header = $this->v('http_accept_header', 'Accept: application/rdf+xml; q=0.9, */*; q=0.1', $this->a);
-    $this->http_user_agent_header = $this->v('http_user_agent_header', 'User-Agent: ARC Reader (http://arc.semsol.org/)', $this->a);
-    $this->http_custom_headers = $this->v('http_custom_headers', '', $this->a);
-    $this->max_redirects = $this->v('max_redirects', 3, $this->a);
-    $this->format = $this->v('format', false, $this->a);
-    $this->redirects = array();
-    $this->stream_id = '';
-    $this->timeout = $this->v('reader_timeout', 30, $this->a);
-    $this->response_headers = array();
-    $this->digest_auth = 0;
-    $this->auth_infos = $this->v('reader_auth_infos', array(), $this->a);
-  }
-
-  /*  */
-  
-  function setHTTPMethod($v) {
-    $this->http_method = $v;
-  }
-
-  function setMessageBody($v) {
-    $this->message_body = $v;
-  }
-
-  function setAcceptHeader($v) {
-    $this->http_accept_header = $v;
-  }
-
-  function setCustomHeaders($v) {
-    $this->http_custom_headers = $v;
-  }
-
-  function addCustomHeaders($v) {
-    if ($this->http_custom_headers) $this->http_custom_headers .= "\r\n";
-    $this->http_custom_headers .= $v;
-  }
-
-  /*  */
-
-  function activate($path, $data = '', $ping_only = 0, $timeout = 0) {
-    $this->setCredentials($path);
-    $this->ping_only = $ping_only;
-    if ($timeout) $this->timeout = $timeout;
-    $id = md5($path . ' ' . $data);
-    if ($this->stream_id != $id) {
-      $this->stream_id = $id;
-      /* data uri? */
-      if (!$data && preg_match('/^data\:([^\,]+)\,(.*)$/', $path, $m)) {
-        $path = '';
-        $data = preg_match('/base64/', $m[1]) ? base64_decode($m[2]) : rawurldecode($m[2]);
-      }
-      $this->base = $this->calcBase($path);
-      $this->uri = $this->calcURI($path, $this->base);
-      $this->stream = ($data) ? $this->getDataStream($data) : $this->getSocketStream($this->base, $ping_only);
-      if ($this->stream && !$this->ping_only) {
-        $this->getFormat();
-      }
-    }
-  }
-
-  /*
-   * HTTP Basic/Digest + Proxy authorization can be defined in the
-   * arc_reader_credentials config setting:
-
-        'arc_reader_credentials' => array(
-          'http://basic.example.com/' => 'user:pass', // shortcut for type=basic
-          'http://digest.example.com/' => 'user::pass', // shortcut for type=digest
-          'http://proxy.example.com/' => array('type' => 'basic', 'proxy', 'user' => 'user', 'pass' => 'pass'),
-        ),
-
-   */
-
-  function setCredentials($url) {
-    if (!$creds = $this->v('arc_reader_credentials', array(), $this->a))  return 0;
-    foreach ($creds as $pattern => $creds) {
-      /* digest shortcut (user::pass) */
-      if (!is_array($creds) && preg_match('/^(.+)\:\:(.+)$/', $creds, $m)) {
-        $creds = array('type' => 'digest', 'user' => $m[1], 'pass' => $m[2]);
-      }
-      /* basic shortcut (user:pass) */
-      if (!is_array($creds) && preg_match('/^(.+)\:(.+)$/', $creds, $m)) {
-        $creds = array('type' => 'basic', 'user' => $m[1], 'pass' => $m[2]);
-      }
-      if (!is_array($creds)) return 0;
-      $regex = '/' . preg_replace('/([\:\/\.\?])/', '\\\\\1', $pattern) . '/';
-      if (!preg_match($regex, $url)) continue;
-      $mthd = 'set' . $this->camelCase($creds['type']) . 'AuthCredentials';
-      if (method_exists($this, $mthd)) $this->$mthd($creds, $url);
-    }
-  }
-
-  function setBasicAuthCredentials($creds) {
-    $auth = 'Basic ' . base64_encode($creds['user'] . ':' . $creds['pass']);
-    $h = in_array('proxy', $creds) ? 'Proxy-Authorization' : 'Authorization';
-    $this->addCustomHeaders($h . ': ' . $auth);
-    //echo $h . ': ' . $auth . print_r($creds, 1);
-  }
-
-  function setDigestAuthCredentials($creds, $url) {
-    $path = $this->v1('path', '/', parse_url($url));
-    $auth = '';
-    $hs = $this->getResponseHeaders();
-    /* initial 401 */
-    $h = $this->v('www-authenticate', '', $hs);
-    if ($h && preg_match('/Digest/i', $h)) {
-      $auth = 'Digest ';
-      /* Digest realm="$realm", nonce="$nonce", qop="auth", opaque="$opaque" */
-      $ks = array('realm', 'nonce', 'opaque');/* skipping qop, assuming "auth" */
-      foreach ($ks as $i => $k) {
-        $$k = preg_match('/' . $k . '=\"?([^\"]+)\"?/i', $h, $m) ? $m[1] : '';
-        $auth .= ($i ? ', ' : '') . $k . '="' . $$k . '"';
-        $this->auth_infos[$k] = $$k;
-      }
-      $this->auth_infos['auth'] = $auth;
-      $this->auth_infos['request_count'] = 1;
-    }
-    /* initial 401 or repeated request */
-    if ($this->v('auth', 0, $this->auth_infos)) {
-      $qop = 'auth';
-      $auth = $this->auth_infos['auth'];
-      $rc = $this->auth_infos['request_count'];
-      $realm = $this->auth_infos['realm'];
-      $nonce = $this->auth_infos['nonce'];
-      $ha1 = md5($creds['user'] . ':' . $realm . ':' . $creds['pass']);
-      $ha2 = md5($this->http_method . ':' . $path);
-      $nc = dechex($rc);
-      $cnonce = dechex($rc * 2);
-      $resp = md5($ha1 . ':' . $nonce . ':' . $nc . ':' . $cnonce . ':' . $qop . ':' . $ha2);
-      $auth .= ', username="' . $creds['user'] . '"' .
-        ', uri="' . $path . '"' .
-        ', qop=' . $qop . '' .
-        ', nc=' . $nc .
-        ', cnonce="' . $cnonce . '"' .
-        ', uri="' . $path . '"' .
-        ', response="' . $resp . '"' .
-      '';
-      $this->auth_infos['request_count'] = $rc + 1;
-    }
-    if (!$auth) return 0;
-    $h = in_array('proxy', $creds) ? 'Proxy-Authorization' : 'Authorization';
-    $this->addCustomHeaders($h . ': ' . $auth);
-  }
-
-  /*  */
-
-  function useProxy($url) {
-    if (!$this->v1('proxy_host', 0, $this->a)) {
-      return false;
-    }
-    $skips = $this->v1('proxy_skip', array(), $this->a);
-    foreach ($skips as $skip) {
-      if (strpos($url, $skip) !== false) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /*  */
-  
-  function createStream($path, $data = '') {
-    $this->base = $this->calcBase($path);
-    $this->stream = ($data) ? $this->getDataStream($data) : $this->getSocketStream($this->base);
-  }
-
-  function getDataStream($data) {
-    return array('type' => 'data', 'pos' => 0, 'headers' => array(), 'size' => strlen($data), 'data' => $data, 'buffer' => '');
-  }
-  
-  function getSocketStream($url) {
-    if ($url == 'file://') {
-      return $this->addError('Error: file does not exists or is not accessible');
-    }
-    $parts = parse_url($url);
-    $mappings = array('file' => 'File', 'http' => 'HTTP', 'https' => 'HTTP');
-    if ($scheme = $this->v(strtolower($parts['scheme']), '', $mappings)) {
-      return $this->m('get' . $scheme . 'Socket', $url, $this->getDataStream(''));
-    }
-  }
-  
-  function getFileSocket($url) {
-    $parts = parse_url($url);
-    $s = file_exists($parts['path']) ? @fopen($parts['path'], 'rb') : false;
-    if (!$s) {
-      return $this->addError('Socket error: Could not open "' . $parts['path'] . '"');
-    }
-    return array('type' => 'socket', 'socket' =>& $s, 'headers' => array(), 'pos' => 0, 'size' => filesize($parts['path']), 'buffer' => '');
-  }
-  
-  function getHTTPSocket($url, $redirs = 0, $prev_parts = '') {
-    $parts = parse_url($url);
-    /* relative redirect */
-    if (!isset($parts['scheme']) && $prev_parts) $parts['scheme'] = $prev_parts['scheme'];
-    if (!isset($parts['host']) && $prev_parts) $parts['host'] = $prev_parts['host'];
-    /* no scheme */
-    if (!$this->v('scheme', '', $parts)) return $this->addError('Socket error: Missing URI scheme.');
-    /* port tweaks */
-    $parts['port'] = ($parts['scheme'] == 'https') ? $this->v1('port', 443, $parts) : $this->v1('port', 80, $parts);
-    $nl = "\r\n";
-    $http_mthd = strtoupper($this->http_method);
-    if ($this->v1('user', 0, $parts) || $this->useProxy($url)) {
-      $h_code = $http_mthd . ' ' . $url;
-    }
-    else {
-      $h_code = $http_mthd . ' ' . $this->v1('path', '/', $parts) . (($v = $this->v1('query', 0, $parts)) ? '?' . $v : '') . (($v = $this->v1('fragment', 0, $parts)) ? '#' . $v : '');
-    }
-    $port_code = ($parts['port'] != 80) ? ':' . $parts['port'] : '';
-    $h_code .= ' HTTP/1.0' . $nl.
-      'Host: ' . $parts['host'] . $port_code . $nl .
-      (($v = $this->http_accept_header) ? $v . $nl : '') .
-      (($v = $this->http_user_agent_header) && !preg_match('/User\-Agent\:/', $this->http_custom_headers) ? $v . $nl : '') .
-      (($http_mthd == 'POST') ? 'Content-Length: ' . strlen($this->message_body) . $nl : '') .
-      ($this->http_custom_headers ? trim($this->http_custom_headers) . $nl : '') .
-      $nl .
-    '';
-    /* post body */
-    if ($http_mthd == 'POST') {
-      $h_code .= $this->message_body . $nl;
-    }
-    /* connect */
-    if ($this->useProxy($url)) {
-      $s = @fsockopen($this->a['proxy_host'], $this->a['proxy_port'], $errno, $errstr, $this->timeout);
-    }
-    elseif (($parts['scheme'] == 'https') && function_exists('stream_socket_client')) {
-      // SSL options via config array, code by Hannes Muehleisen (muehleis@informatik.hu-berlin.de)
-  	  $context = stream_context_create();
-      foreach ($this->a as $k => $v) {
-        if (preg_match('/^arc_reader_ssl_(.+)$/', $k, $m)) {
-          stream_context_set_option($context, 'ssl', $m[1], $v);
-        }
-      }
-      $s = stream_socket_client('ssl://' . $parts['host'] . $port_code, $errno, $errstr, $this->timeout, STREAM_CLIENT_CONNECT, $context);
-    }
-    elseif ($parts['scheme'] == 'https') {
-      $s = @fsockopen('ssl://' . $parts['host'], $parts['port'], $errno, $errstr, $this->timeout);
-    }
-    elseif ($parts['scheme'] == 'http') {
-      $s = @fsockopen($parts['host'], $parts['port'], $errno, $errstr, $this->timeout);
-    }
-    if (!$s) {
-      return $this->addError('Socket error: Could not connect to "' . $url . '" (proxy: ' . ($this->useProxy($url) ? '1' : '0') . '): ' . $errstr);
-    }
-    /* request */
-    fwrite($s, $h_code);
-    /* timeout */
-    if ($this->timeout) {
-      //stream_set_blocking($s, false);
-      stream_set_timeout($s, $this->timeout);
-    }
-    /* response headers */
-    $h = array();
-    $this->response_headers = $h;
-    if (!$this->ping_only) {
-      do {
-        $line = trim(fgets($s, 4096));
-        $info = stream_get_meta_data($s);
-        if (preg_match("/^HTTP[^\s]+\s+([0-9]{1})([0-9]{2})(.*)$/i", $line, $m)) {/* response code */
-          $error = in_array($m[1], array('4', '5')) ? $m[1] . $m[2] . ' ' . $m[3] : '';
-          $error = ($m[1].$m[2] == '304') ? '304 '.$m[3] : $error;
-          $h['response-code'] = $m[1] . $m[2];
-          $h['error'] = $error;
-          $h['redirect'] = ($m[1] == '3') ? true : false;
-        }
-        elseif (preg_match('/^([^\:]+)\:\s*(.*)$/', $line, $m)) {/* header */
-          $h_name = strtolower($m[1]);
-          if (!isset($h[$h_name])) {/* 1st value */
-            $h[$h_name] = trim($m[2]);
-          }
-          elseif (!is_array($h[$h_name])) {/* 2nd value */
-            $h[$h_name] = array($h[$h_name], trim($m[2]));
-          }
-          else {/* more values */
-            $h[$h_name][] = trim($m[2]);
-          }
-        }
-      } while(!$info['timed_out'] && !feof($s) && $line);
-      $h['format'] = strtolower(preg_replace('/^([^\s]+).*$/', '\\1', $this->v('content-type', '', $h)));
-      $h['encoding'] = preg_match('/(utf\-8|iso\-8859\-1|us\-ascii)/', $this->v('content-type', '', $h), $m) ? strtoupper($m[1]) : '';
-      $h['encoding'] = preg_match('/charset=\s*([^\s]+)/si', $this->v('content-type', '', $h), $m) ? strtoupper($m[1]) : $h['encoding'];
-      $this->response_headers = $h;
-      /* result */
-      if ($info['timed_out']) {
-        return $this->addError('Connection timed out after ' . $this->timeout . ' seconds');
-      }
-      /* error */
-      if ($v = $this->v('error', 0, $h)) {
-        /* digest auth */
-        /* 401 received */
-        if (preg_match('/Digest/i', $this->v('www-authenticate', '', $h)) && !$this->digest_auth) {
-          $this->setCredentials($url);
-          $this->digest_auth = 1;
-          return $this->getHTTPSocket($url);
-        }
-        return $this->addError($error . ' "' . (!feof($s) ? trim(strip_tags(fread($s, 128))) . '..."' : ''));
-      }
-      /* redirect */
-      if ($this->v('redirect', 0, $h) && ($new_url = $this->v1('location', 0, $h))) {
-        fclose($s);
-        $this->redirects[$url] = $new_url;
-        $this->base = $new_url;
-        if ($redirs > $this->max_redirects) {
-          return $this->addError('Max numbers of redirects exceeded.');
-        }
-        return $this->getHTTPSocket($new_url, $redirs+1, $parts);
-      }
-    }
-    if ($this->timeout) {
-      stream_set_blocking($s, true);
-    }
-    return array('type' => 'socket', 'url' => $url, 'socket' =>& $s, 'headers' => $h, 'pos' => 0, 'size' => $this->v('content-length', 0, $h), 'buffer' => '');
-  }
-
-  function readStream($buffer_xml = true, $d_size = 1024) {
-    //if (!$s = $this->v('stream')) return '';
-    if (!$s = $this->v('stream')) return $this->addError('missing stream in "readStream" ' . $this->uri);
-    $s_type = $this->v('type', '', $s);
-    $r = $s['buffer'];
-    $s['buffer'] = '';
-    if ($s['size']) $d_size = min($d_size, $s['size'] - $s['pos']);
-    /* data */
-    if ($s_type == 'data') {
-      $d = ($d_size > 0) ? substr($s['data'], $s['pos'], $d_size) : '';
-    }
-    /* socket */
-    elseif ($s_type == 'socket') {
-      $d = ($d_size > 0) && !feof($s['socket']) ? fread($s['socket'], $d_size) : '';
-    }
-    $eof = $d ? false : true;
-    /* chunked despite HTTP 1.0 request */
-    if (isset($s['headers']) && isset($s['headers']['transfer-encoding']) && ($s['headers']['transfer-encoding'] == 'chunked')) {
-      $d = preg_replace('/(^|[\r\n]+)[0-9a-f]{1,4}[\r\n]+/', '', $d);
-    }
-    $s['pos'] += strlen($d);
-    if ($buffer_xml) {/* stop after last closing xml tag (if available) */
-      if (preg_match('/^(.*\>)([^\>]*)$/s', $d, $m)) {
-        $d = $m[1];
-        $s['buffer'] = $m[2];
-      }
-      elseif (!$eof) {
-        $s['buffer'] = $r . $d;
-        $this->stream = $s;
-        return $this->readStream(true, $d_size);
-      }
-    }
-    $this->stream = $s;
-    return $r . $d;
-  }
-  
-  function closeStream() {
-    if (isset($this->stream)) {
-      if ($this->v('type', 0, $this->stream) == 'socket') {
-        @fclose($this->stream['socket']);
-      }
-      unset($this->stream);
-    }
-  }
-  
-  /*  */
-  
-  function getFormat() {
-    if (!$this->format) {
-      if (!$this->v('stream')) {
-        return $this->addError('missing stream in "getFormat"');
-      }
-      $v = $this->readStream(false);
-      $mtype = $this->v('format', '', $this->stream['headers']);
-      $this->stream['buffer'] = $v . $this->stream['buffer'];
-      $ext = preg_match('/\.([^\.]+)$/', $this->uri, $m) ? $m[1] : '';
-      $this->format = ARC2::getFormat($v, $mtype, $ext);
-    }
-    return $this->format;
-  }
-    
-  /*  */
-
-  function getResponseHeaders() {
-    if (isset($this->stream) && isset($this->stream['headers'])) {
-      return $this->stream['headers'];
-    }
-    return $this->response_headers;
-  }
-  
-  function getEncoding($default = 'UTF-8') {
-    return $this->v1('encoding', $default, $this->stream['headers']);
-  }
-
-  function getRedirects() {
-    return $this->redirects;
-  }
-
-  function getAuthInfos() {
-    return $this->auth_infos;
-  }
-  
-  /*  */
-  
-}
diff --git a/libraries/ARC2/ARC2_Resource.php b/libraries/ARC2/ARC2_Resource.php
deleted file mode 100644
index 7308cd878..000000000
--- a/libraries/ARC2/ARC2_Resource.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * ARC2 Resource object
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-11-08
-*/
-
-ARC2::inc('Class');
-
-class ARC2_Resource extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->uri = '';
-    $this->index = array();
-    $this->fetched = array();
-    $this->store = '';
-  }
-
-  /*  */
-  
-  function setURI($uri) {
-    $this->uri = $uri;
-  }
-
-  function setIndex($index) {
-    $this->index = $index;
-  }
-
-  function setProps($props, $s = '') {
-    if (!$s) $s = $this->uri;
-    $this->index[$s] = $props;
-  }
-
-  function setProp($p, $os, $s = '') {
-    if (!$s) $s = $this->uri;
-    /* single plain value */
-    if (!is_array($os)) $os = array('value' => $os, 'type' => 'literal');
-    /* single array value */
-    if (isset($os['value'])) $os = array($os);
-    /* list of values */
-    foreach ($os as $i => $o) {
-      if (!is_array($o)) $os[$i] = array('value' => $o, 'type' => 'literal');
-    }
-    $this->index[$s][$this->expandPName($p)] = $os;
-  }
-
-  function setStore($store) {
-    $this->store = $store;
-  }
-
-  /*  */
-
-  function fetchData($uri = '') {
-    if (!$uri) $uri = $this->uri;
-    if (!$uri) return 0;
-    if (in_array($uri, $this->fetched)) return 0;
-    $this->index[$uri] = array();
-    if ($this->store) {
-      $index = $this->store->query('CONSTRUCT { <' . $uri . '> ?p ?o . } WHERE { <' . $uri . '> ?p ?o . } ', 'raw');
-    }
-    else {
-      $index = $this->toIndex($uri);
-    }
-    $this->index = ARC2::getMergedIndex($this->index, $index);
-    $this->fetched[] = $uri;
-  }
-
-  /*  */
-  
-  function getProps($p = '', $s = '') {
-    if (!$s) $s = $this->uri;
-    if (!$s) return array();
-    if (!isset($this->index[$s])) $this->fetchData($s);
-    if (!$p) return $this->index[$s];
-    return $this->v($this->expandPName($p), array(), $this->index[$s]);
-  }
-
-  function getProp($p, $s = '') {
-    $props = $this->getProps($p, $s);
-    return $props ? $props[0] : '';
-  }
-
-  function getPropValue($p, $s = '') {
-    $prop = $this->getProp($p, $s);
-    return $prop ? $prop['value'] : '';
-  }
-
-  function getPropValues($p, $s = '') {
-    $r = array();
-    $props = $this->getProps($p, $s);
-    foreach ($props as $prop) {
-      $r[] = $prop['value'];
-    }
-    return $r;
-  }
-
-  function hasPropValue($p, $o, $s = '') {
-    $props = $this->getProps($p, $s);
-    $o = $this->expandPName($o);
-    foreach ($props as $prop) {
-      if ($prop['value'] == $o) return 1;
-    }
-    return 0;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/ARC2_getFormat.php b/libraries/ARC2/ARC2_getFormat.php
deleted file mode 100644
index 03b12db3f..000000000
--- a/libraries/ARC2/ARC2_getFormat.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * ARC2 format detection function
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @package ARC2
- * @version 2010-01-18
-*/
-
-function ARC2_getFormat($v, $mtype = '', $ext = '') {
-  $r = false;
-  /* mtype check (atom, rdf/xml, turtle, n3, mp3, jpg) */
-  $r = (!$r && preg_match('/\/atom\+xml/', $mtype)) ? 'atom' : $r;
-  $r = (!$r && preg_match('/\/rdf\+xml/', $mtype)) ? 'rdfxml' : $r;
-  $r = (!$r && preg_match('/\/(x\-)?turtle/', $mtype)) ? 'turtle' : $r;
-  $r = (!$r && preg_match('/\/rdf\+n3/', $mtype)) ? 'n3' : $r;
-  $r = (!$r && preg_match('/\/sparql-results\+xml/', $mtype)) ? 'sparqlxml' : $r;
-  /* xml sniffing */
-  if (
-    !$r &&
-    /* starts with angle brackets */
-    preg_match('/^\s*\<[^\s]/s', $v) &&
-    /* has an xmlns:* declaration or a matching pair of tags */
-    (preg_match('/\sxmlns\:?/', $v) || preg_match('/\<([^\s]+).+\<\/\\1\>/s', $v)) &&
-    /* not a typical ntriples/turtle/n3 file */
-    !preg_match('/[\>\"\']\s*\.\s*$/s', $v)
-  ) {
-    while (preg_match('/^\s*\<\?xml[^\r\n]+\?\>\s*/s', $v)) {
-      $v = preg_replace('/^\s*\<\?xml[^\r\n]+\?\>\s*/s', '', $v);
-    }
-    while (preg_match('/^\s*\<\!--.+?--\>\s*/s', $v)) {
-      $v = preg_replace('/^\s*\<\!--.+?--\>\s*/s', '', $v);
-    }
-    /* doctype checks (html, rdf) */
-    $r = (!$r && preg_match('/^\s*\<\!DOCTYPE\s+html[\s|\>]/is', $v)) ? 'html' : $r;
-    $r = (!$r && preg_match('/^\s*\<\!DOCTYPE\s+[a-z0-9\_\-]\:RDF\s/is', $v)) ? 'rdfxml' : $r;
-    /* markup checks */
-    $v = preg_replace('/^\s*\<\!DOCTYPE\s.*\]\>/is', '', $v);
-    $r = (!$r && preg_match('/^\s*\<rss\s+[^\>]*version/s', $v)) ? 'rss' : $r;
-    $r = (!$r && preg_match('/^\s*\<feed\s+[^\>]+http\:\/\/www\.w3\.org\/2005\/Atom/s', $v)) ? 'atom' : $r;
-    $r = (!$r && preg_match('/^\s*\<opml\s/s', $v)) ? 'opml' : $r;
-    $r = (!$r && preg_match('/^\s*\<html[\s|\>]/is', $v)) ? 'html' : $r;
-    $r = (!$r && preg_match('/^\s*\<sparql\s+[^\>]+http\:\/\/www\.w3\.org\/2005\/sparql\-results\#/s', $v)) ? 'sparqlxml' : $r;
-    $r = (!$r && preg_match('/^\s*\<[^\>]+http\:\/\/www\.w3\.org\/2005\/sparql\-results#/s', $v)) ? 'srx' : $r;
-    $r = (!$r && preg_match('/^\s*\<[^\s]*RDF[\s\>]/s', $v)) ? 'rdfxml' : $r;
-    $r = (!$r && preg_match('/^\s*\<[^\>]+http\:\/\/www\.w3\.org\/1999\/02\/22\-rdf/s', $v)) ? 'rdfxml' : $r;
-    
-    $r = !$r ? 'xml' : $r;
-  }
-  /* json|jsonp */
-  if (!$r && preg_match('/^[a-z0-9\.\(]*\s*[\{\[].*/s', trim($v))) {
-    /* google social graph api */
-    $r = (!$r && preg_match('/\"canonical_mapping\"/', $v)) ? 'sgajson' : $r;
-    /* crunchbase api */
-    $r = (!$r && preg_match('/\"permalink\"/', $v)) ? 'cbjson' : $r;
-
-    $r = !$r ? 'json' : $r;
-  }
-  /* turtle/n3 */
-  $r = (!$r && preg_match('/\@(prefix|base)/i', $v)) ? 'turtle' : $r;
-  $r = (!$r && preg_match('/^(ttl)$/', $ext)) ? 'turtle' : $r;
-  $r = (!$r && preg_match('/^(n3)$/', $ext)) ? 'n3' : $r;
-  /* ntriples */
-  $r = (!$r && preg_match('/^\s*(_:|<).+?\s+<[^>]+?>\s+\S.+?\s*\.\s*$/sm', $v)) ? 'ntriples' : $r;
-  $r = (!$r && preg_match('/^(nt)$/', $ext)) ? 'ntriples' : $r;
-  return $r;
-}
diff --git a/libraries/ARC2/ARC2_getPreferredFormat.php b/libraries/ARC2/ARC2_getPreferredFormat.php
deleted file mode 100644
index 0316d5414..000000000
--- a/libraries/ARC2/ARC2_getPreferredFormat.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * ARC2 result format detection
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-07-15
-*/
-
-function ARC2_getPreferredFormat($default = 'plain') {
-  $formats = array(
-    'html' => 'HTML', 'text/html' => 'HTML', 'xhtml+xml' => 'HTML', 
-    'rdfxml' => 'RDFXML', 'rdf+xml' => 'RDFXML',
-    'ntriples' => 'NTriples', 
-    'rdf+n3' => 'Turtle', 'x-turtle' => 'Turtle', 'turtle' => 'Turtle', 'text/turtle' => 'Turtle',
-    'rdfjson' => 'RDFJSON', 'json' => 'RDFJSON',
-    'xml' => 'XML',
-    'legacyjson' => 'LegacyJSON'
-  );
-  $prefs = array();
-  $o_vals = array();
-  /* accept header */
-  $vals = explode(',', $_SERVER['HTTP_ACCEPT']);
-  if ($vals) {
-    foreach ($vals as $val) {
-      if (preg_match('/(rdf\+n3|(x\-|text\/)turtle|rdf\+xml|text\/html|xhtml\+xml|xml|json)/', $val, $m)) {
-        $o_vals[$m[1]] = 1;
-        if (preg_match('/\;q\=([0-9\.]+)/', $val, $sub_m)) {
-          $o_vals[$m[1]] = 1 * $sub_m[1];
-        }
-      }
-    }
-  }
-  /* arg */
-  if (isset($_GET['format'])) $o_vals[$_GET['format']] = 1.1;
-  /* rank */
-  arsort($o_vals);
-  foreach ($o_vals as $val => $prio) {
-    $prefs[] = $val;
-  }
-  /* default */
-  $prefs[] = $default;
-  foreach ($prefs as $pref) {
-    if (isset($formats[$pref])) {
-      return $formats[$pref];
-    }
-  }
-}
diff --git a/libraries/ARC2/extractors/ARC2_DcExtractor.php b/libraries/ARC2/extractors/ARC2_DcExtractor.php
deleted file mode 100644
index 57424f694..000000000
--- a/libraries/ARC2/extractors/ARC2_DcExtractor.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 DC Extractor
-author:   Benjamin Nowack
-version:  2008-04-09 (Fix: base URL (not doc URL) was used for annotations)
-*/
-
-ARC2::inc('RDFExtractor');
-
-class ARC2_DcExtractor extends ARC2_RDFExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->a['ns']['dc'] = 'http://purl.org/dc/elements/1.1/';
-  }
-
-  /*  */
-  
-  function extractRDF() {
-    $t_vals = array();
-    $t = '';
-    foreach ($this->nodes as $n) {
-      foreach (array('title', 'link', 'meta') as $tag) {
-        if ($n['tag'] == $tag) {
-          $m = 'extract' . ucfirst($tag);
-          list ($t_vals, $t) = $this->$m($n, $t_vals, $t);
-        }
-      }
-    }
-    if ($t) {
-      $doc = $this->getFilledTemplate($t, $t_vals, $n['doc_base']);
-      $this->addTs(ARC2::getTriplesFromIndex($doc));
-    }
-  }
-  
-  /*  */
-
-  function extractTitle($n, $t_vals, $t) {
-    if ($t_vals['title'] = $this->getPlainContent($n)) {
-      $t .= '<' . $n['doc_url'] . '> dc:title ?title . ';
-    }
-    return array($t_vals, $t);
-  }
-  
-  /*  */
-
-  function extractLink($n, $t_vals, $t) {
-    if ($this->hasRel($n, 'alternate') || $this->hasRel($n, 'meta')) {
-      if ($href = $this->v('href uri', '', $n['a'])) {
-        $t .= '<' . $n['doc_url'] . '> rdfs:seeAlso <' . $href . '> . ';
-        if ($v = $this->v('type', '', $n['a'])) {
-          $t .= '<' .$href. '> dc:format "' . $v . '" . ';
-        }
-        if ($v = $this->v('title', '', $n['a'])) {
-          $t .= '<' .$href. '> dc:title "' . $v . '" . ';
-        }
-      }
-    }
-    return array($t_vals, $t);
-  }
-  
-  function extractMeta($n, $t_vals, $t) {
-    if ($this->hasAttribute('http-equiv', $n, 'Content-Type') || $this->hasAttribute('http-equiv', $n, 'content-type')) {
-      if ($v = $this->v('content', '', $n['a'])) {
-        $t .= '<' . $n['doc_url'] . '> dc:format "' . $v . '" . ';
-      }
-    }
-    return array($t_vals, $t);
-  }
-  
-  /*  */
-  
-}
diff --git a/libraries/ARC2/extractors/ARC2_ErdfExtractor.php b/libraries/ARC2/extractors/ARC2_ErdfExtractor.php
deleted file mode 100644
index 090667c93..000000000
--- a/libraries/ARC2/extractors/ARC2_ErdfExtractor.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 eRDF Extractor (w/o link title generation)
-author:   Benjamin Nowack
-version:  2009-02-09 (Tweak: getRootNode returns 1st node if html tag is not found)
-*/
-
-ARC2::inc('RDFExtractor');
-
-class ARC2_ErdfExtractor extends ARC2_RDFExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function extractRDF() {
-    if (!isset($this->caller->detected_formats['erdf'])) return 0;
-    $root_node = $this->getRootNode();
-    $base = $this->getDocBase();
-    $ns = $this->getNamespaces();
-    $context = array(
-      'base' => $base,
-      'prev_res' => $base,
-      'cur_res' => $base,
-      'ns' => $ns,
-      'lang' => '',
-    );
-    $this->processNode($root_node, $context);
-  }
-  
-  /*  */
-  
-  function getRootNode() {
-    foreach ($this->nodes as $id => $node) {
-      if ($node['tag'] == 'html') {
-        return $node;
-      }
-    }
-    return $this->nodes[0];
-  }
-  
-  function getNamespaces() {
-    $r = array(
-      'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-      'rdfs' => 'http://www.w3.org/2000/01/rdf-schema#'
-    );
-    foreach ($this->nodes as $id => $node) {
-      if (preg_match('/^(link|a)$/', $node['tag']) && isset($node['a']['rel']) && preg_match('/schema\.([^\s]+)/is', $node['a']['rel'], $m) && isset($node['a']['href uri'])) {
-        $r[$m[1]] = $node['a']['href uri'];
-      }
-    }
-    return $r;
-  }
-
-  /*  */
-  
-  function processNode($n, $ct) {
-    /* context */
-    //$ct['lang'] = $this->v('xml:lang', $ct['lang'], $n['a']);
-    $ct['lang'] = '';
-    $ct['prop_uris'] = $this->getPropertyURIs($n, $ct);
-    $ct['prev_res'] = $ct['cur_res'];
-    $ct['cur_res'] = $this->getCurrentResourceURI($n, $ct);
-    $ct['cur_obj_id'] = $this->getCurrentObjectID($n, $ct);
-    $ct['cur_obj_literal'] = $this->getCurrentObjectLiteral($n, $ct);
-    /* triple production (http://research.talis.com/2005/erdf/wiki/Main/SummaryOfTripleProductionRules) */
-    foreach ($ct['prop_uris'] as $type => $uris) {
-      foreach ($uris as $uri) {
-        $rdf_type = preg_match('/^ /', $uri) ? 1 : 0;
-        /* meta + name */
-        if (($type == 'name') && ($n['tag'] == 'meta')) {
-          $t = array(
-            's' => $ct['cur_res'],
-            's_type' => 'uri',
-            'p' => $uri, 
-            'o' => $ct['cur_obj_literal']['value'],
-            'o_type' => 'literal',
-            'o_lang' => $ct['cur_obj_literal']['datatype'] ? '' : $ct['cur_obj_literal']['lang'],
-            'o_datatype' => $ct['cur_obj_literal']['datatype'],
-          );
-          $this->addT($t);
-        }
-        /* class */
-        if ($type == 'class') {
-          if ($rdf_type) {
-            $s = $this->v('href uri', $ct['cur_res'], $n['a']);
-            $s = $this->v('src uri', $s, $n['a']);
-            $t = array(
-              's' => $s,
-              's_type' => 'uri',
-              'p' => $ct['ns']['rdf'] . 'type', 
-              'o' => trim($uri),
-              'o_type' => 'uri',
-              'o_lang' => '',
-              'o_datatype' => '',
-            );
-          }
-          elseif (isset($n['a']['id'])) {/* used as object */
-            $t = array(
-              's' => $ct['prev_res'],
-              's_type' => 'uri',
-              'p' => $uri, 
-              'o' => $ct['cur_res'],
-              'o_type' => 'uri',
-              'o_lang' => '',
-              'o_datatype' => '',
-            );
-          }
-          else {
-            $t = array(
-              's' => $ct['cur_res'],
-              's_type' => 'uri',
-              'p' => $uri, 
-              'o' => $ct['cur_obj_literal']['value'],
-              'o_type' => 'literal',
-              'o_lang' => $ct['cur_obj_literal']['datatype'] ? '' : $ct['cur_obj_literal']['lang'],
-              'o_datatype' => $ct['cur_obj_literal']['datatype'],
-            );
-            if (($o = $this->v('src uri', '', $n['a'])) || ($o = $this->v('href uri', '', $n['a']))) {
-              if (!$ct['prop_uris']['rel'] && !$ct['prop_uris']['rev']) {
-                $t['o'] = $o;
-                $t['o_type'] = 'uri';
-                $t['o_lang'] = '';
-                $t['o_datatype'] = '';
-              }
-            }
-          }
-          $this->addT($t);
-        }
-        /* rel */
-        if ($type == 'rel') {
-          if (($o = $this->v('src uri', '', $n['a'])) || ($o = $this->v('href uri', '', $n['a']))) {
-            $t = array(
-              's' => $ct['cur_res'],
-              's_type' => 'uri',
-              'p' => $uri, 
-              'o' => $o,
-              'o_type' => 'uri',
-              'o_lang' => '',
-              'o_datatype' => '',
-            );
-            $this->addT($t);
-          }
-        }
-        /* rev */
-        if ($type == 'rev') {
-          if (($s = $this->v('src uri', '', $n['a'])) || ($s = $this->v('href uri', '', $n['a']))) {
-            $t = array(
-              's' => $s,
-              's_type' => 'uri',
-              'p' => $uri, 
-              'o' => $ct['cur_res'],
-              'o_type' => 'uri',
-              'o_lang' => '',
-              'o_datatype' => '',
-            );
-            $this->addT($t);
-          }
-        }
-      }
-    }
-    /* imgs */
-    if ($n['tag'] == 'img') {
-      if (($s = $this->v('src uri', '', $n['a'])) && $ct['cur_obj_literal']['value']) {
-        $t = array(
-          's' => $s,
-          's_type' => 'uri',
-          'p' => $ct['ns']['rdfs'] . 'label', 
-          'o' => $ct['cur_obj_literal']['value'],
-          'o_type' => 'literal',
-          'o_lang' => $ct['cur_obj_literal']['datatype'] ? '' : $ct['cur_obj_literal']['lang'],
-          'o_datatype' => $ct['cur_obj_literal']['datatype'],
-        );
-        $this->addT($t);
-      }
-    }
-    /* anchors */
-    if ($n['tag'] == 'a') {
-      if (($s = $this->v('href uri', '', $n['a'])) && $ct['cur_obj_literal']['value']) {
-        $t = array(
-          's' => $s,
-          's_type' => 'uri',
-          'p' => $ct['ns']['rdfs'] . 'label', 
-          'o' => $ct['cur_obj_literal']['value'],
-          'o_type' => 'literal',
-          'o_lang' => $ct['cur_obj_literal']['datatype'] ? '' : $ct['cur_obj_literal']['lang'],
-          'o_datatype' => $ct['cur_obj_literal']['datatype'],
-        );
-        $this->addT($t);
-      }
-    }
-    /* recurse */
-    if ($n['tag'] == 'a') {
-      $ct['cur_res'] = $ct['cur_obj_id'];
-    }
-    $sub_nodes = $this->getSubNodes($n);
-    foreach ($sub_nodes as $sub_node) {
-      $this->processNode($sub_node, $ct);
-    }
-  }
-
-  /*  */
-  
-  function getPropertyURIs($n, $ct) {
-    $r = array();
-    foreach (array('rel', 'rev', 'class', 'name', 'src') as $type) {
-      $r[$type] = array();
-      $vals = $this->v($type . ' m', array(), $n['a']);
-      foreach ($vals as $val) {
-        if (!trim($val)) continue;
-        list($uri, $sub_v) = $this->xQname(trim($val, '- '), $ct['base'], $ct['ns'], $type);
-        if (!$uri) continue;
-        $rdf_type = preg_match('/^-/', trim($val)) ? 1 : 0;
-        $r[$type][] = $rdf_type ? ' ' . $uri : $uri;
-      }
-    }
-    return $r;
-  }
-
-  function getCurrentResourceURI($n, $ct) {
-    if (isset($n['a']['id'])) {
-      list($r, $sub_v) = $this->xURI('#' . $n['a']['id'], $ct['base'], $ct['ns']);
-      return $r;
-    }
-    return $ct['cur_res'];
-  }
-  
-  function getCurrentObjectID($n, $ct) {
-    foreach (array('href', 'src') as $a) {
-      if (isset($n['a'][$a])) {
-        list($r, $sub_v) = $this->xURI($n['a'][$a], $ct['base'], $ct['ns']);
-        return $r;
-      }
-    }
-    return $this->createBnodeID();
-  }
-
-  function getCurrentObjectLiteral($n, $ct) {
-    $r = array('value' => '', 'lang' => $ct['lang'], 'datatype' => '');
-    if (isset($n['a']['content'])) {
-      $r['value'] = $n['a']['content'];
-    }
-    elseif (isset($n['a']['title'])) {
-      $r['value'] = $n['a']['title'];
-    }
-    else {
-      $r['value'] = $this->getPlainContent($n);
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function xURI($v, $base, $ns, $attr_type = '') {
-    if ((list($sub_r, $sub_v) = $this->xQname($v, $base, $ns)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    if (preg_match('/^(rel|rev|class|name)$/', $attr_type) && preg_match('/^[a-z0-9]+$/', $v)) {
-      return array(0, $v);
-    }
-    return array($this->calcURI($v, $base), '');
-  }
-  
-  function xQname($v, $base, $ns) {
-    if ($sub_r = $this->x('([a-z0-9\-\_]+)[\-\.]([a-z0-9\-\_]+)', $v)) {
-      if (isset($ns[$sub_r[1]])) {
-        return array($ns[$sub_r[1]] . $sub_r[2], '');
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/extractors/ARC2_MicroformatsExtractor.php b/libraries/ARC2/extractors/ARC2_MicroformatsExtractor.php
deleted file mode 100644
index ee1dff78a..000000000
--- a/libraries/ARC2/extractors/ARC2_MicroformatsExtractor.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 microformats Extractor
-author:   Benjamin Nowack
-version:  
-*/
-
-ARC2::inc('ARC2_PoshRdfExtractor');
-
-class ARC2_MicroformatsExtractor extends ARC2_PoshRdfExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->terms = $this->getTerms();
-    $this->ns_prefix = 'mf';
-    $this->a['ns']['mf'] = 'http://poshrdf.org/ns/mf#';
-    $this->caller->detected_formats['posh-rdf'] = 1;
-  }
-
-  /*  */
-  
-  function preProcessNode($n) {
-    if (!$n) return $n;
-    /* remove existing poshRDF hooks */
-    if (!is_array($n['a'])) $n['a'] = array();
-    $n['a']['class'] = isset($n['a']['class']) ? preg_replace('/\s?rdf\-(s|p|o|o-xml)/', '', $n['a']['class']): '';
-    if (!isset($n['a']['rel'])) $n['a']['rel'] = '';
-    /* inject poshRDF hooks */
-    foreach ($this->terms as $term => $infos) {
-      if ((!in_array('rel', $infos) && $this->hasClass($n, $term)) || $this->hasRel($n, $term)) {
-        if ($this->v('scope', '', $infos)) $infos[] = 'p';
-        foreach (array('s', 'p', 'o', 'o-xml') as $type) {
-          if (in_array($type, $infos)) {
-            $n['a']['class'] .= ' rdf-' . $type;
-            $n['a']['class'] = preg_replace('/(^|\s)' . $term . '(\s|$)/s', '\\1mf-' . $term . '\\2', $n['a']['class']);
-            $n['a']['rel'] = preg_replace('/(^|\s)' . $term . '(\s|$)/s', '\\1mf-' . $term . '\\2', $n['a']['rel']);
-          }
-        }
-      }
-    }
-    $n['a']['class m'] = preg_split('/ /', $n['a']['class']);
-    $n['a']['rel m'] = preg_split('/ /', $n['a']['rel']);
-    return $n;
-  }
-  
-  function getPredicates($n, $ns) {
-    $ns = array('mf' => $ns['mf']);
-    return parent::getPredicates($n, $ns);
-  }
-  
-  function tweakObject($o, $p, $ct) {
-    $ns = $ct['ns']['mf'];
-    /* rel-tag, skill => extract from URL */
-    if (in_array($p, array($ns . 'tag', $ns . 'skill'))) {
-      $o = preg_replace('/^.*\/([^\/]+)/', '\\1', trim($o, '/'));
-      $o = urldecode(rawurldecode($o));
-    }
-    return $o;
-  }
-  
-  /*  */
-  
-  function getTerms() {
-    /* no need to define 'p' if scope is not empty */
-    return array(
-      'acquaintance' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'additional-name' => array('o', 'scope' => array('n')),
-      'adr' => array('s', 'o', 'scope' => array('_doc', 'vcard')),
-      'affiliation' => array('s', 'o', 'scope' => array('hresume')),
-      'author' => array('s', 'o', 'scope' => array('hentry')),
-      'bday' => array('o', 'scope' => array('vcard')),
-      'bio' => array('o', 'scope' => array('vcard')),
-      'best' => array('o', 'scope' => array('hreview')),
-      'bookmark' => array('o', 'scope' => array('_doc', 'hentry', 'hreview')),
-      'class' => array('o', 'scope' => array('vcard', 'vevent')),
-      'category' => array('o', 's', 'scope' => array('vcard', 'vevent')),
-      'child' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'co-resident' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'co-worker' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'colleague' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'contact' => array('o', 'scope' => array('_doc', 'hresume', 'hentry')),
-      'country-name' => array('o', 'scope' => array('adr')),
-      'crush' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'date' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'description' => array('o', 'scope' => array('vevent', 'hreview', 'xfolkentry')),
-      'directory' => array('o', 'rel', 'scope' => array('_doc', 'hfeed', 'hentry', 'hreview')),
-      'dtend' => array('o', 'scope' => array('vevent')),
-      'dtreviewed' => array('o', 'scope' => array('hreview')),
-      'dtstamp' => array('o', 'scope' => array('vevent')),
-      'dtstart' => array('o', 'scope' => array('vevent')),
-      'duration' => array('o', 'scope' => array('vevent')),
-      'education' => array('s', 'o', 'scope' => array('hresume')),
-      'email' => array('s', 'o', 'scope' => array('vcard')),
-      'entry-title' => array('o', 'scope' => array('hentry')),
-      'entry-content' => array('o-xml', 'scope' => array('hentry')),
-      'entry-summary' => array('o', 'scope' => array('hentry')),
-      'experience' => array('s', 'o', 'scope' => array('hresume')),
-      'extended-address' => array('o', 'scope' => array('adr')),
-      'family-name' => array('o', 'scope' => array('n')),
-      'fn' => array('o', 'plain', 'scope' => array('vcard', 'item')),
-      'friend' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'geo' => array('s', 'scope' => array('_doc', 'vcard', 'vevent')),
-      'given-name' => array('o', 'scope' => array('n')),
-      'hentry' => array('s', 'o', 'scope' => array('_doc', 'hfeed')),
-      'hfeed' => array('s', 'scope' => array('_doc')),
-      'honorific-prefix' => array('o', 'scope' => array('n')),
-      'honorific-suffix' => array('o', 'scope' => array('n')),
-      'hresume' => array('s', 'scope' => array('_doc')),
-      'hreview' => array('s', 'scope' => array('_doc')),
-      'item' => array('s', 'scope' => array('hreview')),
-      'key' => array('o', 'scope' => array('vcard')),
-      'kin' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'label' => array('o', 'scope' => array('vcard')),
-      'last-modified' => array('o', 'scope' => array('vevent')),
-      'latitude' => array('o', 'scope' => array('geo')),
-      'license' => array('o', 'rel', 'scope' => array('_doc', 'hfeed', 'hentry', 'hreview')),
-      'locality' => array('o', 'scope' => array('adr')),
-      'location' => array('o', 'scope' => array('vevent')),
-      'logo' => array('o', 'scope' => array('vcard')),
-      'longitude' => array('o', 'scope' => array('geo')),
-      'mailer' => array('o', 'scope' => array('vcard')),
-      'me' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'met' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'muse' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'n' => array('s', 'o', 'scope' => array('vcard')),
-      'neighbor' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'nickname' => array('o', 'plain', 'scope' => array('vcard')),
-      'nofollow' => array('o', 'rel', 'scope' => array('_doc')),
-      'note' => array('o', 'scope' => array('vcard')),
-      'org' => array('o', 'xplain', 'scope' => array('vcard')),
-      'parent' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'permalink' => array('o', 'scope' => array('hreview')),
-      'photo' => array('o', 'scope' => array('vcard', 'item')),
-      'post-office-box' => array('o', 'scope' => array('adr')),
-      'postal-code' => array('o', 'scope' => array('adr')),
-      'publication' => array('s', 'o', 'scope' => array('hresume')),
-      'published' => array('o', 'scope' => array('hentry')),
-      'rating' => array('o', 'scope' => array('hreview')),
-      'region' => array('o', 'scope' => array('adr')),
-      'rev' => array('o', 'scope' => array('vcard')),
-      'reviewer' => array('s', 'o', 'scope' => array('hreview')),
-      'role' => array('o', 'plain', 'scope' => array('vcard')),
-      'sibling' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'skill' => array('o', 'scope' => array('hresume')),
-      'sort-string' => array('o', 'scope' => array('vcard')),
-      'sound' => array('o', 'scope' => array('vcard')),
-      'spouse' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'status' => array('o', 'plain', 'scope' => array('vevent')),
-      'street-address' => array('o', 'scope' => array('adr')),
-      'summary' => array('o', 'scope' => array('vevent', 'hreview', 'hresume')),
-      'sweetheart' => array('o', 'rel', 'scope' => array('_doc', 'hentry')),
-      'tag' => array('o', 'rel', 'scope' => array('_doc', 'category', 'hfeed', 'hentry', 'skill', 'hreview', 'xfolkentry')),
-      'taggedlink' => array('o', 'scope' => array('xfolkentry')),
-      'title' => array('o', 'scope' => array('vcard')),
-      'type' => array('o', 'scope' => array('adr', 'email', 'hreview', 'tel')),
-      'tz' => array('o', 'scope' => array('vcard')),
-      'uid' => array('o', 'scope' => array('vcard', 'vevent')),
-      'updated' => array('o', 'scope' => array('hentry')),
-      'url' => array('o', 'scope' => array('vcard', 'vevent', 'item')),
-      'value' => array('o', 'scope' => array('email', 'adr', 'tel')),
-      'vcard' => array('s', 'scope' => array('author', 'reviewer', 'affiliation', 'contact')),
-      'version' => array('o', 'scope' => array('hreview')),
-      'vevent' => array('s', 'scope' => array('_doc')),
-      'worst' => array('o', 'scope' => array('hreview')),
-      'xfolkentry' => array('s', 'scope' => array('_doc')),
-    );
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/extractors/ARC2_OpenidExtractor.php b/libraries/ARC2/extractors/ARC2_OpenidExtractor.php
deleted file mode 100644
index 5c4f951fd..000000000
--- a/libraries/ARC2/extractors/ARC2_OpenidExtractor.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 foaf:openid Extractor
-author:   Benjamin Nowack
-version:  2007-10-08
-*/
-
-ARC2::inc('RDFExtractor');
-
-class ARC2_OpenidExtractor extends ARC2_RDFExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->a['ns']['foaf'] = 'http://xmlns.com/foaf/0.1/';
-  }
-
-  /*  */
-  
-  function extractRDF() {
-    $t_vals = array();
-    $t = '';
-    foreach ($this->nodes as $n) {
-      if (isset($n['tag']) && $n['tag'] == 'link') {
-        $m = 'extract' . ucfirst($n['tag']);
-        list ($t_vals, $t) = $this->$m($n, $t_vals, $t);
-      }
-    }
-    if ($t) {
-      $doc = $this->getFilledTemplate($t, $t_vals, $n['doc_base']);
-      $this->addTs(ARC2::getTriplesFromIndex($doc));
-    }
-  }
-  
-  /*  */
-
-  function extractLink($n, $t_vals, $t) {
-    if ($this->hasRel($n, 'openid.server')) {
-      if ($href = $this->v('href uri', '', $n['a'])) {
-        $t_vals['doc_owner'] = $this->getDocOwnerID($n);
-        $t_vals['doc_id'] = $this->getDocID($n);
-        $t .= '?doc_owner foaf:homepage ?doc_id ; foaf:openid ?doc_id . ';
-      }
-    }
-    if ($this->hasRel($n, 'openid.delegate')) {
-      if ($href = $this->v('href uri', '', $n['a'])) {
-        $t_vals['doc_owner'] = $this->getDocOwnerID($n);
-        $t .= '?doc_owner foaf:homepage <' . $href . '> ; foaf:openid <' . $href . '> . ';
-      }
-    }
-    return array($t_vals, $t);
-  }
-  
-  /*  */
-  
-}
diff --git a/libraries/ARC2/extractors/ARC2_PoshRdfExtractor.php b/libraries/ARC2/extractors/ARC2_PoshRdfExtractor.php
deleted file mode 100644
index 9fc090e06..000000000
--- a/libraries/ARC2/extractors/ARC2_PoshRdfExtractor.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 poshRDF Extractor
-author:   Benjamin Nowack
-version:  
-*/
-
-ARC2::inc('ARC2_RDFExtractor');
-
-class ARC2_PoshRdfExtractor extends ARC2_RDFExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->terms = $this->v('posh_terms', array(), $this->a);
-    $this->ns_prefix = 'posh';
-    $this->a['ns'] += array(
-      'an' => 'http://www.w3.org/2000/10/annotation-ns#',
-      'content' => 'http://purl.org/rss/1.0/modules/content/',
-      'dc' => 'http://purl.org/dc/elements/1.1/',
-      'dct' => 'http://purl.org/dc/terms/',
-      'foaf' => 'http://xmlns.com/foaf/0.1/',
-      'geo' => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-      'ical' => 'http://www.w3.org/2002/12/cal/icaltzd#',
-      'owl' => 'http://www.w3.org/2002/07/owl#',
-      'posh' => 'http://poshrdf.org/ns/posh/',
-      'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-      'rdfs' => 'http://www.w3.org/2000/01/rdf-schema#',
-      'rev' => 'http://www.purl.org/stuff/rev#',
-      'rss' => 'http://purl.org/rss/1.0/',
-      'sioc' => 'http://rdfs.org/sioc/ns#',
-      'skos' => 'http://www.w3.org/2008/05/skos#',
-      'uri' => 'http://www.w3.org/2006/uri#',
-      'vcard' => 'http://www.w3.org/2006/vcard/ns#',
-      'xfn' => 'http://gmpg.org/xfn/11#',
-      'xml' => 'http://www.w3.org/XML/1998/namespace',
-      'xsd' => 'http://www.w3.org/2001/XMLSchema#',
-    );
-  }
-
-  /*  */
-  
-  function extractRDF() {
-    if (!isset($this->caller->detected_formats['posh-rdf'])) return 0;
-    $n = $this->getRootNode();
-    $base = $this->getDocBase();
-    $context = array(
-      'id' => $n['id'],
-      'tag' => $n['tag'],
-      'base' => $base,
-      's' => array(array('_doc', $base)),
-      'next_s' => array('_doc', $base),
-      'ps' => array(),
-      'ns' => $this->a['ns'],
-      'lang' => '',
-      'rpointer' => '',
-    );
-    $ct = $this->processNode($n, $context, 0, 1);
-  }
-  
-  /*  */
-
-  function getRootNode() {
-    foreach ($this->nodes as $id => $node) {
-      if ($node['tag'] == 'html') {
-        return $node;
-      }
-    }
-    return $this->nodes[0];
-  }
-  
-  /*  */
-
-  function processNode($n, $ct, $level, $pos) {
-    $n = $this->preProcessNode($n);
-    /* local context */
-    $lct = array_merge($ct, array(
-      'ns' => array_merge($ct['ns'], $this->v('xmlns', array(), $n['a'])),
-      'rpointer' => isset($n['a']['id']) ? $n['a']['id'] : ($n['tag'] == 'cdata' ? '' : $ct['rpointer'] . '/' . $pos),
-      'tag' => $n['tag'],
-      'id' => $n['id'],
-      'lang' => $this->v('xml:lang', $ct['lang'], $n['a']),
-    ));
-    /* s stack */
-    $next_s_key = $lct['next_s'][0];
-    $next_s_val = $lct['next_s'][1];
-    if ($lct['s'][0][0] != $next_s_key) {
-      $lct['s'] = array_merge(array($lct['next_s']), $lct['s']);
-    }
-    else {
-      $lct['s'][0][1] = $next_s_val;
-    }
-    /* new s */
-    if ($this->hasClass($n, 'rdf-s')) {
-      $lct['next_s'] = array($n['a']['class'], $this->getSubject($n, $lct));
-      //echo "\ns: " . print_r($lct['next_s'], 1);
-    }
-    /* p */
-    if ($this->hasClass($n, 'rdf-p') || $this->hasRel($n, 'rdf-p')) {
-      if ($ps = $this->getPredicates($n, $lct['ns'])) {
-        $lct['ps'] = $ps;
-        $this->addPoshTypes($lct);
-      }
-    }
-    /* o */
-    $cls = $this->v('class', '', $n['a']);
-    if ($lct['ps'] && preg_match('/(^|\s)rdf\-(o|o\-(xml|dateTime|float|integer|boolean))($|\s)/s', $cls, $m)) {
-      $this->addTriples($n, $lct, $m[3]);
-    }
-    /* sub-nodes */
-    if ($sub_nodes = $this->getSubNodes($n)) {
-      $cur_ct = $lct;
-      $sub_pos = 1;
-      foreach ($sub_nodes as $i => $sub_node) {
-        if (in_array($sub_node['tag'], array('cdata', 'comment'))) continue;
-        $sub_ct = $this->processNode($sub_node, $cur_ct, $level + 1, $sub_pos);
-        $sub_pos++;
-        $cur_ct['next_s'] = $sub_ct['next_s'];
-        $cur_ct['ps'] = $sub_ct['ps'];
-      }
-    }
-    return $lct;
-  }
-  
-  /*  */
-  
-  function getSubject($n, $ct) {
-    foreach (array('href uri', 'src uri', 'title', 'value') as $k) {
-      if (isset($n['a'][$k])) return $n['a'][$k];
-    }
-    /* rpointer */
-    return $ct['base'] . '#resource(' . $ct['rpointer'] . ')';
-  }
-  
-  function getPredicates($n, $ns) {
-    $r = array();
-    /* try pnames */
-    $vals = array_merge($this->v('class m', array(), $n['a']), $this->v('rel m', array(), $n['a']));
-    foreach ($vals as $val) {
-      if (!preg_match('/^([a-z0-9]+)\-([a-z0-9\-\_]+)$/i', $val, $m)) continue;
-      if (!isset($ns[$m[1]])) continue;
-      if (preg_match('/^rdf-(s|p|o|o-(xml|dateTime|float|integer|boolean))$/', $val)) continue;
-      $r[] = $ns[$m[1]] . $m[2];
-    }
-    /* try other attributes */
-    if (!$r) {
-      foreach (array('href uri', 'title') as $k) {
-        if (isset($n['a'][$k])) {
-          $r[] = $n['a'][$k];
-          break;
-        }
-      }
-    }
-    return $r;
-  }
-
-  function addTriples($n, $ct, $o_type) {
-    foreach (array('href uri', 'src uri', 'title', 'value') as $k) {
-      if (isset($n['a'][$k])) {
-        $node_o = $n['a'][$k];
-        break;
-      }
-    }
-    if (!isset($node_o) && $this->hasClass($n, 'rdf-s')) {
-      $node_o = $ct['next_s'][1];
-    }
-    $lit_o = ($o_type == 'xml') ? $this->getContent($n) : $this->getPlainContent($n);
-    $posh_ns = $ct['ns'][$this->ns_prefix];
-    $rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $xsd = 'http://www.w3.org/2001/XMLSchema#';
-    foreach ($ct['ps'] as $p) {
-      $p_key = str_replace($posh_ns, '', $p);
-      /* dt or obj */
-      $o = $this->isDatatypeProperty($p_key) ? $lit_o : (isset($node_o) ? $node_o : $lit_o);
-      if (!$o) continue;
-      if (!$s = $this->getContainerSubject($ct, $p_key)) continue;
-      $lang = (($o == $lit_o) && !$o_type) ? $ct['lang'] : '';
-      $o = $this->tweakObject($o, $p, $ct);
-      $this->addT(array(
-        's' => $this->getContainerSubject($ct, $p_key),
-        's_type' => preg_match('/^\_\:/', $s) ? 'bnode' : 'uri',
-        'p' => $p, 
-        'o' => $o,
-        'o_type' => $this->getObjectType($o, $p_key),
-        'o_lang' => $lang,
-        'o_datatype' => ($o_type == 'xml') ? $rdf . 'XMLLiteral' : ($o_type ? $xsd . $o_type : ''),
-      ));
-    }
-  }
-
-  function addPoshTypes($ct) {
-    $posh_ns = $ct['ns'][$this->ns_prefix];
-    foreach ($ct['ps'] as $p) {
-      $p_key = str_replace($posh_ns, '', $p);
-      if (!$this->isSubject($p_key)) continue;
-      $s = $ct['next_s'][1];
-      $this->addT(array(
-        's' => $s,
-        's_type' => preg_match('/^\_\:/', $s) ? 'bnode' : 'uri',
-        'p' => $ct['ns']['rdf'] . 'type', 
-        'o' => $posh_ns . ucfirst($p_key),
-        'o_type' => 'uri',
-        'o_lang' => '',
-        'o_datatype' => '',
-      ));
-    }
-  }
-  
-  /*  */
-  
-  function preProcessNode($n) {
-    return $n;
-  }
-  
-  function getContainerSubject($ct, $term) {
-    if (!isset($this->terms[$term])) return $ct['s'][0][1];
-    $scope = $this->v('scope', array(), $this->terms[$term]);
-    if (!$scope) return $ct['s'][0][1];
-    $scope_re = join('|', $scope);
-    foreach ($ct['s'] as $s) {
-      if (preg_match('/(^|\s)(' . $scope_re. ')($|\s)/s', str_replace($this->ns_prefix . '-', '', $s[0]))) return $s[1];
-    }
-    return 0;
-  }
-  
-  function isSubject($term) {
-    if (!isset($this->terms[$term])) return 0;
-    return in_array('s', $this->terms[$term]);
-  }
-  
-  function isDatatypeProperty($term) {
-    if (!isset($this->terms[$term])) return 0;
-    return in_array('plain', $this->terms[$term]);
-  }
-  
-  function getObjectType($o, $term) {
-    if ($this->isDatatypeProperty($term)) return 'literal';
-    if (strpos($o, ' ')) return 'literal';
-    return preg_match('/^([a-z0-9\_]+)\:[^\s]+$/s', $o, $m) ? ($m[1] == '_' ? 'bnode' : 'uri') : 'literal';
-  }
-  
-  function tweakObject($o, $p, $ct) {
-    return $o;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/extractors/ARC2_RDFExtractor.php b/libraries/ARC2/extractors/ARC2_RDFExtractor.php
deleted file mode 100644
index b62f92e2c..000000000
--- a/libraries/ARC2/extractors/ARC2_RDFExtractor.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDF Extractor
-author:   Benjamin Nowack
-version:  2008-11-18 (Fix: Skip comments. Thanks to Masahide Kanzaki)
-*/
-
-ARC2::inc('Class');
-
-class ARC2_RDFExtractor extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->nodes = $this->caller->getNodes();
-    $this->index = $this->caller->getNodeIndex();
-    $this->bnode_prefix = $this->v('bnode_prefix', 'arc' . substr(md5(uniqid(rand())), 0, 4) . 'b', $this->a);
-    $this->bnode_id = 0;
-    $this->keep_cdata_ws = $this->v('keep_cdata_whitespace', 0, $this->a);
-    if (!isset($this->a['ns'])) $this->a['ns'] = array('rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
-  }
-
-  /*  */
-  
-  function x($re, $v, $options = 'si') {
-    return ARC2::x($re, $v, $options);
-  }
-
-  function createBnodeID(){
-    $this->bnode_id++;
-    return '_:' . $this->bnode_prefix . $this->bnode_id;
-  }
-
-  /*  */
-  
-  function extractRDF() {
-  }
-
-  /*  */
-  
-  function addTs($ts) {
-    foreach ($ts as $t) {
-      $this->caller->addT($t);
-    }
-  }
-  
-  function addT($t) {
-    return $this->caller->addT($t);
-  }
-  
-  /*  */
-  
-  function getSubNodes($n) {
-    return $this->v($n['id'], array(), $this->index);
-  }
-  
-  function getParentNode($n) {
-    return isset($this->nodes[$n['p_id']]) ? $this->nodes[$n['p_id']] : 0;
-  }
-
-  /*  */
-  
-  function getSubNodesByClass($n, $cls, $skip_self = 0) {
-    if (!$skip_self && $this->hasClass($n, $cls)) {
-      return array($n);
-    }
-    $r = array();
-    $sns = $this->getSubNodes($n);
-    foreach ($sns as $sn) {
-      if ($sub_r = $this->getSubNodesByClass($sn, $cls, 0)) {
-        $r = array_merge($r, $sub_r);
-      }
-    }
-    return $r;
-  }
-  
-  function getSubNodeByClass($n, $cls, $skip_self = 0) {
-    if (!$skip_self && $this->hasClass($n, $cls)) {
-      return $n;
-    }
-    $sns = $this->getSubNodes($n);
-    foreach ($sns as $sn) {
-      if ($sub_r = $this->getSubNodeByClass($sn, $cls, 0)) {
-        return $sub_r;
-      }
-    }
-    return 0;
-  }
-  
-  function getParentNodeByClass($n, $cls, $skip_self = 0) {
-    if (!$skip_self && $this->hasClass($n, $cls)) {
-      return $n;
-    }
-    if ($pn = $this->getParentNode($n)) {
-      if ($sub_r = $this->getParentNodeByClass($pn, $cls, 0)) {
-        return $sub_r;
-      }
-    }
-    return 0;
-  }
-  
-  /*  */
-  
-  function hasAttribute($a, $n, $v) {
-    $vs = is_array($v) ? $v : array($v);
-    $a_vs = $this->v($a . ' m', array(), $n['a']);
-    return array_intersect($vs, $a_vs) ? 1 : 0;
-  }
-  
-  function hasClass($n, $v) {
-    return $this->hasAttribute('class', $n, $v);
-  }
-
-  function hasRel($n, $v) {
-    return $this->hasAttribute('rel', $n, $v);
-  }
-
-  /*  */
-
-  function getDocBase() {
-    $root_node = $this->getRootNode();
-    $r = $root_node['doc_base'];
-    foreach ($this->getSubNodes($root_node) as $root_child) {
-      if ($root_child['tag'] == 'head') {
-        foreach ($this->getSubNodes($root_child) as $head_child) {
-          if ($head_child['tag'] == 'base') {
-            $r = $head_child['a']['href'];
-            break;
-          }
-        }
-      }
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function getPlainContent($n, $trim = 1, $use_img_alt = 1) {
-    if ($n['tag'] == 'comment') {
-      $r = '';
-    }
-    elseif ($n['tag'] == 'cdata') {
-      $r = $n['a']['value'];
-    }
-    elseif (trim($this->v('cdata', '', $n))) {
-      $r = $n['cdata'];
-      $sub_nodes = $this->getSubNodes($n);
-      foreach ($sub_nodes as $sub_n) {
-        $r .= $this->getPlainContent($sub_n, 0, $use_img_alt);
-      }
-    }
-    elseif (($n['tag'] == 'img') && $use_img_alt && isset($n['a']['alt'])) {
-      $r = $n['a']['alt'];
-    }
-    else {
-      $r = '';
-      $sub_nodes = $this->getSubNodes($n);
-      foreach ($sub_nodes as $sub_n) {
-        $r .= $this->getPlainContent($sub_n, 0, $use_img_alt);
-      }
-    }
-    $r = preg_replace('/\s/s', ' ', $r);
-    $r = preg_replace('/\s\s*/s', ' ', $r);
-    return $trim ? trim($r) : $r;
-  }
-  
-  function getContent($n, $outer = 0, $trim = 1) {
-    //echo '<pre>' . htmlspecialchars(print_r($n, 1)) . '</pre>';
-    if ($n['tag'] == 'comment') {
-      $r = '<!-- ' . $n['a']['value'] . ' -->';
-    }
-    elseif ($n['tag'] == 'cdata') {
-      $r = $n['a']['value'];
-    }
-    else {
-      $r = '';
-      if ($outer) {
-        $r .= '<' . $n['tag'];
-        asort($n['a']);
-        if (isset($n['a']['xmlns']) && $n['a']['xmlns']['']) {
-          $r .= ' xmlns="' . $n['a']['xmlns'][''] . '"';
-        }
-        foreach ($n['a'] as $a => $val) {
-          if (!is_array($val) && isset($n['a'][$a . ' uri'])) $val = $n['a'][$a . ' uri'];
-          $r .= preg_match('/^[^\s]+$/', $a) && !is_array($val) ? ' ' . $a . '="' . addslashes($val) . '"' : '';
-        }
-        $r .= $n['empty'] ? '/>' : '>';
-      }
-      if (!$n['empty']) {
-        $r .= $this->v('cdata', '', $n);
-        $sub_nodes = $this->getSubNodes($n);
-        foreach ($sub_nodes as $sub_n) {
-          $r .= $this->getContent($sub_n, 1, 0);
-        }
-        if ($outer) {
-          $r .= '</' . $n['tag'] . '>';
-        }
-      }
-    }
-    return ($trim && !$this->keep_cdata_ws) ? trim($r) : $r;
-  }
-  
-  /*  */
-  
-  function getDocID($n) {
-    $id = $n['id'];
-    $k = 'doc_' . $id;
-    if (!isset($this->caller->cache[$k])) {
-      $this->caller->cache[$k] = $n['doc_url'];
-    }
-    return $this->caller->cache[$k];
-  }
-
-  function getDocOwnerID($n) {
-    return '_:owner_of_' . $this->normalize($this->getDocID($n));
-  }
-  
-  /*  */
-
-  function normalize($v) {
-    $v = preg_replace('/[\W\s]+/is', '_', strip_tags(strtolower($v)));
-    $v = preg_replace('/http/', '', $v);
-    $v = preg_replace('/[\_]+/', '_', $v);
-    //$v = substr($v, 0, 30);
-    $v = trim($v, '_');
-    return $v;
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/extractors/ARC2_RdfaExtractor.php b/libraries/ARC2/extractors/ARC2_RdfaExtractor.php
deleted file mode 100644
index 14913874b..000000000
--- a/libraries/ARC2/extractors/ARC2_RdfaExtractor.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDFa Extractor
-author:   Benjamin Nowack
-version:  2009-05-29 (Fix: CURIEs support DOTs now)
-*/
-
-ARC2::inc('RDFExtractor');
-
-class ARC2_RdfaExtractor extends ARC2_RDFExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function extractRDF() {
-    //echo '<pre>' . htmlspecialchars(print_r($this->nodes, 1)) . '</pre>';
-    if (!isset($this->caller->detected_formats['rdfa'])) return 0;
-    $root_node = $this->getRootNode();
-    //$base = $this->v('xml:base', $this->getDocBase(), $root_node['a']);
-    $base = $this->getDocBase();
-    $context = array(
-      'base' => $base,
-      'p_s' => $base,
-      'p_o' => '',
-      'ns' => array(),
-      'inco_ts' => array(),
-      'lang' => '',
-    );
-    $this->processNode($root_node, $context, 0);
-  }
-  
-  /*  */
-  
-  function getRootNode() {
-    foreach ($this->nodes as $id => $node) {
-      if ($node['tag'] == 'html') {
-        return $node;
-      }
-    }
-    return $this->nodes[0];
-  }
-  
-  /*  */
-
-  function processNode($n, $ct, $level) {
-    if ($n['tag']=='cdata' || $n['tag']=='comment') return null; /* patch by tobyink */
-    $ts_added = 0;
-    /* step 1 */
-    $lct = array();
-    $lct['prev_s'] = $this->v('prev_s', $this->v('p_s', '', $ct), $ct);
-    $lct['recurse'] = 1;
-    $lct['skip'] = 0;
-    $lct['new_s'] = '';
-    $lct['cur_o_res'] = '';
-    $lct['inco_ts'] = array();
-    $lct['base'] = $ct['base'];
-    //$lct['base'] = $this->v('xml:base', $ct['base'], $n['a']);
-    /* step 2 */
-    $lct['ns'] = array_merge($ct['ns'], $this->v('xmlns', array(), $n['a']));
-    /* step 3 */
-    $lct['lang'] = $this->v('xml:lang', $ct['lang'], $n['a']);
-    /* step 4 */
-    $rel_uris = $this->getAttributeURIs($n, $ct, $lct, 'rel');
-    $rev_uris = $this->getAttributeURIs($n, $ct, $lct, 'rev');
-    if (!$rel_uris && !$rev_uris) {
-      foreach (array('about', 'src', 'resource', 'href') as $attr) {
-        if (isset($n['a'][$attr]) && (list($uri, $sub_v) = $this->xURI($n['a'][$attr], $lct['base'], $lct['ns'], '', $lct)) && $uri) {
-          $lct['new_s'] = $uri;
-          break;
-        }
-      }
-      if (!$lct['new_s']) {
-        if (preg_match('/(head|body)/i', $n['tag'])) {
-          $lct['new_s'] = $lct['base'];
-        }
-        elseif ($this->getAttributeURIs($n, $ct, $lct, 'typeof')) {
-          $lct['new_s'] = $this->createBnodeID();
-        }
-        elseif ($ct['p_o']) {
-          $lct['new_s'] = $ct['p_o'];
-          //$lct['skip'] = 1;
-          if(!isset($n['a']['property'])) $lct['skip'] = 1;/* patch by masaka */
-        }
-      }
-    }
-    /* step 5 */
-    else {
-      foreach (array('about', 'src') as $attr) {
-        if (isset($n['a'][$attr]) && (list($uri, $sub_v) = $this->xURI($n['a'][$attr], $lct['base'], $lct['ns'], '', $lct)) && $uri) {
-          $lct['new_s'] = $uri;
-          break;
-        }
-      }
-      if (!$lct['new_s']) {
-        if (preg_match('/(head|body)/i', $n['tag'])) {
-          $lct['new_s'] = $lct['base'];
-        }
-        elseif ($this->getAttributeURIs($n, $ct, $lct, 'typeof')) {
-          $lct['new_s'] = $this->createBnodeID();
-        }
-        elseif ($ct['p_o']) {
-          $lct['new_s'] = $ct['p_o'];
-        }
-      }
-      foreach (array('resource', 'href') as $attr) {
-        if (isset($n['a'][$attr]) && (list($uri, $sub_v) = $this->xURI($n['a'][$attr], $lct['base'], $lct['ns'], '', $lct)) && $uri) {
-          $lct['cur_o_res'] = $uri;
-          break;
-        }
-      }
-    }
-    /* step 6 */
-    if ($lct['new_s']) {
-      if ($uris = $this->getAttributeURIs($n, $ct, $lct, 'typeof')) {
-        foreach ($uris as $uri) {
-          $this->addT(array(
-            's' => $lct['new_s'],
-            's_type' => preg_match('/^\_\:/', $lct['new_s']) ? 'bnode' : 'uri',
-            'p' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 
-            'o' => $uri,
-            'o_type' => 'uri',
-            'o_lang' => '',
-            'o_datatype' => '',
-          ));
-          $ts_added = 1;
-        }
-      }
-      /* step 7 */
-      if ($lct['cur_o_res']) {
-        if ($rel_uris) {
-          foreach ($rel_uris as $uri) {
-            $this->addT(array(
-              's' => $lct['new_s'],
-              's_type' => preg_match('/^\_\:/', $lct['new_s']) ? 'bnode' : 'uri',
-              'p' => $uri, 
-              'o' => $lct['cur_o_res'],
-              'o_type' => preg_match('/^\_\:/', $lct['cur_o_res']) ? 'bnode' : 'uri',
-              'o_lang' => '',
-              'o_datatype' => '',
-            ));
-            $ts_added = 1;
-          }
-        }
-        if ($rev_uris) {
-          foreach ($rev_uris as $uri) {
-            $this->addT(array(
-              's' => $lct['cur_o_res'],
-              's_type' => preg_match('/^\_\:/', $lct['cur_o_res']) ? 'bnode' : 'uri',
-              'p' => $uri, 
-              'o' => $lct['new_s'],
-              'o_type' => preg_match('/^\_\:/', $lct['new_s']) ? 'bnode' : 'uri',
-              'o_lang' => '',
-              'o_datatype' => '',
-            ));
-            $ts_added = 1;
-          }
-        }
-      }
-    }
-    /* step 8 */
-    if (!$lct['cur_o_res']) {
-      if ($rel_uris || $rev_uris) {
-        $lct['cur_o_res'] = $this->createBnodeID();
-        foreach ($rel_uris as $uri) {
-          $lct['inco_ts'][] = array('p' => $uri, 'dir' => 'fwd');
-        }
-        foreach ($rev_uris as $uri) {
-          $lct['inco_ts'][] = array('p' => $uri, 'dir' => 'rev');
-        }
-      }
-    }
-    /* step 10 */
-    if (!$lct['skip'] && ($new_s = $lct['new_s'])) {
-    //if ($new_s = $lct['new_s']) {
-      if ($uris = $this->getAttributeURIs($n, $ct, $lct, 'property')) {
-        foreach ($uris as $uri) {
-          $lct['cur_o_lit'] = $this->getCurrentObjectLiteral($n, $lct, $ct);
-          $this->addT(array(
-            's' => $lct['new_s'],
-            's_type' => preg_match('/^\_\:/', $lct['new_s']) ? 'bnode' : 'uri',
-            'p' => $uri, 
-            'o' => $lct['cur_o_lit']['value'],
-            'o_type' => 'literal',
-            'o_lang' => $lct['cur_o_lit']['lang'],
-            'o_datatype' => $lct['cur_o_lit']['datatype'],
-          ));
-          $ts_added = 1;
-          if ($lct['cur_o_lit']['datatype'] == 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral') {
-            $lct['recurse'] = 0;
-          }
-        }
-      }
-    }
-    /* step 11 (10) */
-    $complete_triples = 0;
-    if ($lct['recurse']) {
-      if ($lct['skip']) {
-        $new_ct = array_merge($ct, array('base' => $lct['base'], 'lang' => $lct['lang'], 'ns' => $lct['ns']));
-      }
-      else {
-        $new_ct = array(
-          'base' => $lct['base'],
-          'p_s' => $lct['new_s'] ? $lct['new_s'] : $ct['p_s'],
-          'p_o' => $lct['cur_o_res'] ? $lct['cur_o_res'] : ($lct['new_s'] ? $lct['new_s'] : $ct['p_s']),
-          'ns' => $lct['ns'],
-          'inco_ts' => $lct['inco_ts'],
-          'lang' => $lct['lang']
-        );
-      }
-      $sub_nodes = $this->getSubNodes($n);
-      foreach ($sub_nodes as $sub_node) {
-        if ($this->processNode($sub_node, $new_ct, $level+1)) {
-          $complete_triples = 1;
-        }
-      }
-    }
-    /* step 12 (11) */
-    $other = 0;
-    if ($ts_added || $complete_triples || ($lct['new_s'] && !preg_match('/^\_\:/', $lct['new_s'])) || ($other == 1)) {
-    //if (!$lct['skip'] && ($complete_triples || ($lct['new_s'] && !preg_match('/^\_\:/', $lct['new_s'])))) {
-      foreach ($ct['inco_ts'] as $inco_t) {
-        if ($inco_t['dir'] == 'fwd') {
-          $this->addT(array(
-            's' => $ct['p_s'],
-            's_type' => preg_match('/^\_\:/', $ct['p_s']) ? 'bnode' : 'uri',
-            'p' => $inco_t['p'],
-            'o' => $lct['new_s'],
-            'o_type' => preg_match('/^\_\:/', $lct['new_s']) ? 'bnode' : 'uri',
-            'o_lang' => '',
-            'o_datatype' => '',
-          ));
-        }
-        elseif ($inco_t['dir'] == 'rev') {
-          $this->addT(array(
-            's' => $lct['new_s'],
-            's_type' => preg_match('/^\_\:/', $lct['new_s']) ? 'bnode' : 'uri',
-            'p' => $inco_t['p'], 
-            'o' => $ct['p_s'],
-            'o_type' => preg_match('/^\_\:/', $ct['p_s']) ? 'bnode' : 'uri',
-            'o_lang' => '',
-            'o_datatype' => '',
-          ));
-        }
-      }
-    }
-    /* step 13 (12) (result flag) */
-    if ($ts_added) return 1;
-    if ($lct['new_s'] && !preg_match('/^\_\:/', $lct['new_s'])) return 1;
-    if ($complete_triples) return 1;
-    return 0;
-  }
-  
-  /*  */
-
-  function getAttributeURIs($n, $ct, $lct, $attr) {
-    $vals = ($val = $this->v($attr, '', $n['a'])) ? explode(' ', $val) : array();
-    $r = array();
-    foreach ($vals as $val) {
-      if(!trim($val)) continue;
-      if ((list($uri, $sub_v) = $this->xURI(trim($val), $lct['base'], $lct['ns'], $attr, $lct)) && $uri) {
-        $r[] = $uri;
-      }
-    }
-    return $r;
-  }
-  
-  /*  */
-
-  function getCurrentObjectLiteral($n, $lct, $ct) {
-    $xml_val = $this->getContent($n);
-    $plain_val = $this->getPlainContent($n, 0, 0);
-    if (function_exists('html_entity_decode')) {
-      $plain_val = html_entity_decode($plain_val, ENT_QUOTES);
-    }
-    $dt = $this->v('datatype', '', $n['a']);
-    list($dt_uri, $sub_v) = $this->xURI($dt, $lct['base'], $lct['ns'], '', $lct);
-    $dt = $dt ? $dt_uri : $dt;
-    $r = array('value' => '', 'lang' => $lct['lang'], 'datatype' => $dt);
-    if (isset($n['a']['content'])) {
-      $r['value'] = $n['a']['content'];
-      if (function_exists('html_entity_decode')) {
-        $r['value'] = html_entity_decode($r['value'], ENT_QUOTES);
-      }
-    }
-    elseif ($xml_val == $plain_val) {
-      $r['value'] = $plain_val;
-    }
-    elseif (!preg_match('/[\<\>]/', $xml_val)) {
-      $r['value'] = $xml_val;
-    }
-    elseif (isset($n['a']['datatype']) && ($dt != 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral')) {
-      $r['value'] = $plain_val;
-    }
-    elseif (!isset($n['a']['datatype']) || ($dt == 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral')) {
-      $r['value'] = $this->injectXMLDeclarations($xml_val, $lct['ns'], $lct['lang']);
-      $r['datatype'] = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral';
-    }
-    return $r;
-  }
-  
-  function injectXMLDeclarations($val, $ns, $lang) {//@@todo proper node rebuilding */
-    $lang_code = $lang ? ' xml:lang="' . $lang . '"' : '';
-    /* ns */
-    $val = preg_replace('/<([a-z0-9]+)([\>\s])/is', '<\\1 xmlns="http://www.w3.org/1999/xhtml"' . $lang_code . '\\2', $val);
-    foreach ($ns as $prefix => $uri) {
-      if ($prefix && ($pos = strpos(' ' . $val, '<' . $prefix . ':'))) {
-        $val = substr($val, 0, $pos - 1) . preg_replace('/^(<' . $prefix . '\:[^\>\s]+)/', '\\1 xmlns:' . $prefix. '="' . $uri . '"' . $lang_code, substr($val, $pos - 1));
-      }
-    }
-    /* remove accidentally added xml:lang and xmlns= */
-    $val = preg_replace('/(\<[^\>]*)( xml\:lang[^\s\>]+)([^\>]*)(xml\:lang[^\s\>]+)/s', '\\1\\3\\4', $val);
-    $val = preg_replace('/(\<[^\>]*)( xmlns=[^\s\>]+)([^\>]*)(xmlns=[^\s\>]+)/s', '\\1\\3\\4', $val);
-    return $val;
-  }
-  
-  /*  */
-  
-  function xURI($v, $base, $ns, $attr_type = '', $lct = '') {
-    if ((list($sub_r, $sub_v) = $this->xBlankCURIE($v, $base, $ns)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    if ((list($sub_r, $sub_v) = $this->xSafeCURIE($v, $base, $ns, $lct)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    if ((list($sub_r, $sub_v) = $this->xCURIE($v, $base, $ns)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    if (preg_match('/^(rel|rev)$/', $attr_type) && preg_match('/^\s*(alternate|appendix|bookmark|cite|chapter|contents|copyright|glossary|help|icon|index|last|license|meta|next|p3pv1|prev|role|section|stylesheet|subsection|start|up)(\s|$)/is', $v, $m)) {
-      return array('http://www.w3.org/1999/xhtml/vocab#' . strtolower($m[1]), preg_replace('/^\s*' . $m[1]. '/is', '', $v));
-    }
-    if (preg_match('/^(rel|rev)$/', $attr_type) && preg_match('/^[a-z0-9\.]+$/i', $v)) {
-      return array(0, $v);
-    }
-    return array($this->calcURI($v, $base), '');
-  }
-  
-  function xBlankCURIE($v, $base, $ns) {
-    if ($sub_r = $this->x('\[\_\:\]', $v)) {
-      $this->empty_bnode = isset($this->empty_bnode) ? $this->empty_bnode : $this->createBnodeID();
-      return array($this->empty_bnode, '');
-    }
-    if ($sub_r = $this->x('\[?(\_\:[a-z0-9\_\-]+)\]?', $v)) {
-      return array($sub_r[1], '');
-    }
-    return array(0, $v);
-  }
-  
-  function xSafeCURIE($v, $base, $ns, $lct = '') {
-    /* empty */
-    if ($sub_r = $this->x('\[\]', $v)) {
-      $r = $lct ? $lct['prev_s'] : $base;/* should be current subject value */
-      return $sub_r[1] ? array($r, $sub_r[1]) : array($r, '');
-    }
-    if ($sub_r = $this->x('\[([^\:]*)\:([^\]]*)\]', $v)) {
-      if (!$sub_r[1]) return array('http://www.w3.org/1999/xhtml/vocab#' . $sub_r[2], '');
-      if (isset($ns[$sub_r[1]])) {
-        return array($ns[$sub_r[1]] . $sub_r[2], '');
-      }
-    }
-    return array(0, $v);
-  }
-  
-  function xCURIE($v, $base, $ns) {
-    if ($sub_r = $this->x('([a-z0-9\-\_]*)\:([^\s]+)', $v)) {
-      if (!$sub_r[1]) return array('http://www.w3.org/1999/xhtml/vocab#' . $sub_r[2], '');
-      if (isset($ns[$sub_r[1]])) {
-        return array($ns[$sub_r[1]] . $sub_r[2], '');
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/extractors/ARC2_TwitterProfilePicExtractor.php b/libraries/ARC2/extractors/ARC2_TwitterProfilePicExtractor.php
deleted file mode 100644
index 529d853f4..000000000
--- a/libraries/ARC2/extractors/ARC2_TwitterProfilePicExtractor.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Extractor
-author:   Benjamin Nowack
-version:  2008-12-09
-*/
-
-ARC2::inc('RDFExtractor');
-
-class ARC2_TwitterProfilePicExtractor extends ARC2_RDFExtractor {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->a['ns']['foaf'] = 'http://xmlns.com/foaf/0.1/';
-    $this->a['ns']['mf'] = 'http://poshrdf.org/ns/mf#';
-  }
-
-  /*  */
-  
-  function extractRDF() {
-    $t_vals = array();
-    $t = '';
-    foreach ($this->nodes as $n) {
-      if (isset($n['tag']) && ($n['tag'] == 'img') && ($this->v('id', '', $n['a']) == 'profile-image')) {
-        $t_vals['vcard_id'] = $this->getDocID($n) . '#resource(side/1/2/1)';
-        $t .= '?vcard_id mf:photo <' . $n['a']['src'] . '> . ';
-        break;
-      }
-    }
-    if ($t) {
-      $doc = $this->getFilledTemplate($t, $t_vals, $n['doc_base']);
-      $this->addTs(ARC2::getTriplesFromIndex($doc));
-    }
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_AtomParser.php b/libraries/ARC2/parsers/ARC2_AtomParser.php
deleted file mode 100644
index a491bcb8d..000000000
--- a/libraries/ARC2/parsers/ARC2_AtomParser.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Atom Parser
-author:   Benjamin Nowack
-version:  2009-04-21 (Addition: support for link types)
-*/
-
-ARC2::inc('LegacyXMLParser');
-
-class ARC2_AtomParser extends ARC2_LegacyXMLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->triples = array();
-    $this->target_encoding = '';
-    $this->t_count = 0;
-    $this->added_triples = array();
-    $this->skip_dupes = false;
-    $this->bnode_prefix = $this->v('bnode_prefix', 'arc'.substr(md5(uniqid(rand())), 0, 4).'b', $this->a);
-    $this->bnode_id = 0;
-    $this->cache = array();
-    $this->allowCDataNodes = 0;
-  }
-  
-  /*  */
-  
-  function done() {
-    $this->extractRDF();
-  }
-  
-  /*  */
-  
-  function setReader(&$reader) {
-    $this->reader = $reader;
-  }
-  
-  function createBnodeID(){
-    $this->bnode_id++;
-    return '_:' . $this->bnode_prefix . $this->bnode_id;
-  }
-  
-  function addT($t) {
-    //if (!isset($t['o_datatype']))
-    if ($this->skip_dupes) {
-      //$h = md5(print_r($t, 1));
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-
-  function countTriples() {
-    return $this->t_count;
-  }
-  
-  function getSimpleIndex($flatten_objects = 1, $vals = '') {
-    return ARC2::getSimpleIndex($this->getTriples(), $flatten_objects, $vals);
-  }
-
-  /*  */
-
-  function extractRDF() {
-    $index = $this->getNodeIndex();
-    //print_r($index);
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->atom = 'http://www.w3.org/2005/Atom';
-    $this->rss = 'http://purl.org/rss/1.0/';
-    $this->dc = 'http://purl.org/dc/elements/1.1/';
-    $this->sioc = 'http://rdfs.org/sioc/ns#';
-    $this->dct = 'http://purl.org/dc/terms/';
-    $this->content = 'http://purl.org/rss/1.0/modules/content/';
-    $this->enc = 'http://purl.oclc.org/net/rss_2.0/enc#';
-    $this->mappings = array(
-      'feed' => $this->rss . 'channel',
-      'entry' => $this->rss . 'item',
-      'title' => $this->rss . 'title',
-      'link' => $this->rss . 'link',
-      'summary' => $this->rss . 'description',
-      'content' => $this->content . 'encoded',
-      'id' => $this->dc . 'identifier',
-      'author' => $this->dc . 'creator',
-      'category' => $this->dc . 'subject',
-      'updated' => $this->dc . 'date',
-      'source' => $this->dc . 'source',
-    );
-    $this->dt_props = array(
-      $this->dc . 'identifier',
-      $this->rss . 'link'
-    );
-    foreach ($index as $p_id => $nodes) {
-      foreach ($nodes as $pos => $node) {
-        $tag = $this->v('tag', '', $node);
-        if ($tag == 'feed') {
-          $struct = $this->extractChannel($index[$node['id']]);
-          $triples = ARC2::getTriplesFromIndex($struct);
-          foreach ($triples as $t) {
-            $this->addT($t);
-          }
-        }
-        elseif ($tag == 'entry') {
-          $struct = $this->extractItem($index[$node['id']]);
-          $triples = ARC2::getTriplesFromIndex($struct);
-          foreach ($triples as $t) {
-            $this->addT($t);
-          }
-        }
-      }
-    }
-  }
-  
-  function extractChannel($els) {
-    list($props, $sub_index) = $this->extractProps($els, 'channel');
-    $uri = $props[$this->rss . 'link'][0]['value'];
-    return ARC2::getMergedIndex(array($uri => $props), $sub_index);
-  }
-  
-  function extractItem($els) {
-    list($props, $sub_index) = $this->extractProps($els, 'item');
-    $uri = $props[$this->rss . 'link'][0]['value'];
-    return ARC2::getMergedIndex(array($uri => $props), $sub_index);
-  }
-  
-  function extractProps($els, $container) {
-    $r = array($this->rdf . 'type' => array(array('value' => $this->rss . $container, 'type' => 'uri')));
-    $sub_index = array();
-    foreach ($els as $info) {
-      /* key */
-      $tag = $info['tag'];
-      if (!preg_match('/^[a-z0-9]+\:/i', $tag)) {
-        $k = isset($this->mappings[$tag]) ? $this->mappings[$tag] : '';
-      }
-      elseif (isset($this->mappings[$tag])) {
-        $k = $this->mappings[$tag];
-      }
-      else {/* qname */
-        $k = $this->expandPName($tag);
-      }
-      //echo $k . "\n";
-      if (($container == 'channel') && ($k == $this->rss . 'item')) continue;
-      /* val */
-      $v = trim($info['cdata']);
-      if (!$v) $v = $this->v('href uri', '', $info['a']);
-      /* prop */
-      if ($k) {
-        /* content handling */
-        if (in_array($k, array($this->rss . 'description', $this->content . 'encoded'))) {
-          $v = $this->getNodeContent($info);
-        }
-        /* source handling */
-        elseif ($k == $this->dc . 'source') {
-          $sub_nodes = $this->node_index[$info['id']];
-          foreach ($sub_nodes as $sub_pos => $sub_info) {
-            if ($sub_info['tag'] == 'id') {
-              $v = trim($sub_info['cdata']);
-            }
-          }
-        }
-        /* link handling */
-        elseif ($k == $this->rss . 'link') {
-          if ($link_type = $this->v('type', '', $info['a'])) {
-            $k2 = $this->dc . 'format';
-            if (!isset($sub_index[$v])) $sub_index[$v] = array();
-            if (!isset($sub_index[$v][$k2])) $sub_index[$v][$k2] = array();
-            $sub_index[$v][$k2][] = array('value' => $link_type, 'type' => 'literal');
-          }
-        }
-        /* author handling */
-        elseif ($k == $this->dc . 'creator') {
-          $sub_nodes = $this->node_index[$info['id']];
-          foreach ($sub_nodes as $sub_pos => $sub_info) {
-            if ($sub_info['tag'] == 'name') {
-              $v = trim($sub_info['cdata']);
-            }
-            if ($sub_info['tag'] == 'uri') {
-              $k2 = $this->sioc . 'has_creator';
-              $v2 = trim($sub_info['cdata']);
-              if (!isset($r[$k2])) $r[$k2] = array();
-              $r[$k2][] = array('value' => $v2, 'type' => 'uri');
-            }
-          }
-        }
-        /* date handling */
-        elseif (in_array($k, array($this->dc . 'date', $this->dct . 'modified'))) {
-          if (!preg_match('/^[0-9]{4}/', $v) && ($sub_v = strtotime($v)) && ($sub_v != -1)) {
-            $tz = date('Z', $sub_v); /* timezone offset */
-            $sub_v -= $tz; /* utc */
-            $v = date('Y-m-d\TH:i:s\Z', $sub_v);
-          }
-        }
-        /* tag handling */
-        elseif ($k == $this->dc . 'subject') {
-          $v = $this->v('term', '', $info['a']);
-        }
-        /* other attributes in closed tags */
-        elseif (!$v && ($info['state'] == 'closed') && $info['a']) {
-          foreach ($info['a'] as $sub_k => $sub_v) {
-            if (!preg_match('/(xmlns|\:|type)/', $sub_k)) {
-              $v = $sub_v;
-              break;
-            }
-          }
-        }
-        if (!isset($r[$k])) $r[$k] = array();
-        $r[$k][] = array('value' => $v, 'type' => in_array($k, $this->dt_props) || !preg_match('/^[a-z0-9]+\:[^\s]+$/is', $v) ? 'literal' : 'uri');
-      }
-    }
-    return array($r, $sub_index);
-  }
-  
-  function initXMLParser() {
-    if (!isset($this->xml_parser)) {
-      $enc = preg_match('/^(utf\-8|iso\-8859\-1|us\-ascii)$/i', $this->getEncoding(), $m) ? $m[1] : 'UTF-8';
-      $parser = xml_parser_create($enc);
-      xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
-      xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-      xml_set_element_handler($parser, 'open', 'close');
-      xml_set_character_data_handler($parser, 'cData');
-      xml_set_start_namespace_decl_handler($parser, 'nsDecl');
-      xml_set_object($parser, $this);
-      $this->xml_parser = $parser;
-    }
-  }
-
-  /*  */
-
-
-}
diff --git a/libraries/ARC2/parsers/ARC2_CBJSONParser.php b/libraries/ARC2/parsers/ARC2_CBJSONParser.php
deleted file mode 100644
index 91e90b0cb..000000000
--- a/libraries/ARC2/parsers/ARC2_CBJSONParser.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * ARC2 CrunchBase API JSON Parser
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-03-25
-*/
-
-ARC2::inc('JSONParser');
-
-class ARC2_CBJSONParser extends ARC2_JSONParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->base = 'http://cb.semsol.org/';
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->default_ns = $this->base . 'ns#';
-    $this->nsp = array($this->rdf => 'rdf');
-  }
-  
-  /*  */
-
-  function done() {
-    $this->extractRDF();
-  }
-  
-  function extractRDF() {
-    $struct = $this->struct;
-    if ($type = $this->getStructType($struct)) {
-      $s = $this->getResourceID($struct, $type);
-      /* rdf:type */
-      $this->addT($s, $this->rdf . 'type', $this->default_ns . $this->camelCase($type), 'uri', 'uri');
-      /* explicit triples */
-      $this->extractResourceRDF($struct, $s);
-    }
-  }
-  
-  function getStructType($struct, $rel = '') {
-    /* url-based */
-    if ($url = $this->v('crunchbase_url', '', $struct)) {
-      return preg_replace('/^.*crunchbase\.com\/([^\/]+)\/.*$/', '\\1', $url);
-    }
-    /* rel-based */
-    if ($rel == 'person') return 'person';
-    if ($rel == 'company') return 'company';
-    if ($rel == 'acquiring_company') return 'company';
-    if ($rel == 'firm') return 'company';
-    if ($rel == 'provider') return 'service-provider';
-    /* struct-based */
-    if (isset($struct['_type'])) return $struct['_type'];
-    if (isset($struct['round_code'])) return 'funding_round';
-    if (isset($struct['products'])) return 'company';
-    if (isset($struct['first_name'])) return 'person';
-    if (isset($struct['investments'])) return 'financial-organization';
-    if (isset($struct['launched_year'])) return 'product';
-    if (isset($struct['providerships']) && is_array($struct['providerships'])) return 'service-provider';
-    return '';
-  }
-  
-  function getResourceID($struct, $type) {
-    if ($type && isset($struct['permalink'])) {
-      return $this->base . $type . '/' . $struct['permalink'] . '#self';
-    }
-    return $this->createBnodeID();
-  }
-  
-  function getPropertyURI($name, $ns = '') {
-    if (!$ns) $ns = $this->default_ns;
-    if (preg_match('/^(product|funding_round|investment|acquisition|.+ship|office|milestone|.+embed|.+link|degree|fund)s/', $name, $m)) $name = $m[1];
-    if ($name == 'tag_list') $name = 'tag';
-    if ($name == 'competitions') $name = 'competitor';
-    return $ns . $name;
-  }
-
-  function createSubURI($s, $k, $pos) {
-    $s = str_replace('#self', '/', $s);
-    if (preg_match('/(office|ship|investment|milestone|fund|embed|link)s$/', $k)) $k = substr($k, 0, -1);
-    return $s . $k . '-' . ($pos + 1) . '#self';
-  }
-  
-  /*  */
-  
-  function extractResourceRDF($struct, $s, $pos = 0) {
-    $s_type = preg_match('/^\_\:/', $s) ? 'bnode' : 'uri';
-    $date_prefixes = array();
-    foreach ($struct as $k => $v) {
-      if ($k == 'acquisition') $k = 'exit';
-      if (preg_match('/^(.*)\_(year|month|day)$/', $k, $m)) {
-        if (!in_array($m[1], $date_prefixes)) $date_prefixes[] = $m[1];
-      }
-      $sub_m = 'extract' . $this->camelCase($k) . 'RDF';
-      if (method_exists($this, $sub_m)) {
-        $this->$sub_m($s, $s_type, $v);
-        continue;
-      }
-      $p = $this->getPropertyURI($k);
-      if (!$v) continue;
-      /* simple, single v */
-      if (!is_array($v)) {
-        $o_type = preg_match('/^[a-z]+\:[^\s]+$/is', $v) ? 'uri' : 'literal';
-        $v = trim($v);
-        if (preg_match('/^https?\:\/\/[^\/]+$/', $v)) $v .= '/';
-        $this->addT($s, $p, $v, $s_type, $o_type);
-        /* rdfs:label */
-        if ($k == 'name') $this->addT($s, 'http://www.w3.org/2000/01/rdf-schema#label', $v, $s_type, $o_type);
-        /* dc:identifier */
-        //if ($k == 'permalink') $this->addT($s, 'http://purl.org/dc/elements/1.1/identifier', $v, $s_type, $o_type);
-      }
-      /* structured, single v */
-      elseif (!$this->isFlatArray($v)) {
-        if ($o_type = $this->getStructType($v, $k)) {/* known type */
-          $o = $this->getResourceID($v, $o_type);
-          $this->addT($s, $p, $o, $s_type, 'uri');
-          $this->addT($o, $this->rdf . 'type', $this->default_ns . $this->camelCase($o_type), 'uri', 'uri');
-        }
-        else {/* unknown type */
-          $o = $this->createSubURI($s, $k, $pos);
-          $this->addT($s, $p, $o, $s_type, 'uri');
-          $this->extractResourceRDF($v, $o);
-        }
-      }
-      /* value list */
-      else {
-        foreach ($v as $sub_pos => $sub_v) {
-          $this->extractResourceRDF(array($k => $sub_v), $s, $sub_pos);
-        }
-      }
-    }
-    /* infer XSD triples */
-    foreach ($date_prefixes as $prefix) {
-      $this->inferDate($prefix, $s, $struct);
-    }
-  }
-
-  function isFlatArray($v) {
-    foreach ($v as $k => $sub_v) {
-      return is_numeric($k) ? 1 : 0;
-    }
-  }
-  
-  /*  */
-  
-  function extractTagListRDF($s, $s_type,  $v) {
-    if (!$v) return 0;
-    $tags = preg_split('/\, /', $v);
-    foreach ($tags as $tag) {
-      if (!trim($tag)) continue;
-      $this->addT($s, $this->getPropertyURI('tag'), $tag, $s_type, 'literal');
-    }
-  }
-
-  function extractImageRDF($s, $s_type, $v, $rel = 'image') {
-    if (!$v) return 1;
-    $sizes = $v['available_sizes'];
-    foreach ($sizes as $size) {
-      $w = $size[0][0];
-      $h = $size[0][1];
-      $img = 'http://www.crunchbase.com/' . $size[1];
-      $this->addT($s, $this->getPropertyURI($rel), $img, $s_type, 'uri');
-      $this->addT($img, $this->getPropertyURI('width'), $w, 'uri', 'literal');
-      $this->addT($img, $this->getPropertyURI('height'), $h, 'uri', 'literal');
-    }
-  }
-
-  function extractScreenshotsRDF($s, $s_type, $v) {
-    if (!$v) return 1;
-    foreach ($v as $sub_v) {
-      $this->extractImageRDF($s, $s_type, $sub_v, 'screenshot');
-    }
-  }
-  
-  function extractProductsRDF($s, $s_type, $v) {
-    foreach ($v as $sub_v) {
-      $o = $this->getResourceID($sub_v, 'product');
-      $this->addT($s, $this->getPropertyURI('product'), $o, $s_type, 'uri');
-    }
-  }
-
-  function extractCompetitionsRDF($s, $s_type, $v) {
-    foreach ($v as $sub_v) {
-      $o = $this->getResourceID($sub_v['competitor'], 'company');
-      $this->addT($s, $this->getPropertyURI('competitor'), $o, $s_type, 'uri');
-    }
-  }
-
-  function extractFundingRoundsRDF($s, $s_type, $v) {
-    foreach ($v as $pos => $sub_v) {
-      $o = $this->createSubURI($s, 'funding_round', $pos);
-      $this->addT($s, $this->getPropertyURI('funding_round'), $o, $s_type, 'uri');
-      $this->extractResourceRDF($sub_v, $o, $pos);
-    }
-  }
-
-  function extractInvestmentsRDF($s, $s_type, $v) {
-    foreach ($v as $pos => $sub_v) {
-      /* incoming */
-      foreach (array('person' => 'person', 'company' => 'company', 'financial_org' => 'financial-organization') as $k => $type) {
-        if (isset($sub_v[$k])) $this->addT($s, $this->getPropertyURI('investment'), $this->getResourceID($sub_v[$k], $type), $s_type, 'uri');
-      }
-      /* outgoing */
-      if (isset($sub_v['funding_round'])) {
-        $o = $this->createSubURI($s, 'investment', $pos);
-        $this->addT($s, $this->getPropertyURI('investment'), $o, $s_type, 'uri');
-        $this->extractResourceRDF($sub_v['funding_round'], $o, $pos);
-      }
-    }
-  }
-  
-  function extractExternalLinksRDF($s, $s_type, $v) {
-    foreach ($v as $sub_v) {
-      $href = $sub_v['external_url'];
-      if (preg_match('/^https?\:\/\/[^\/]+$/', $href)) $href .= '/';
-      $this->addT($s, $this->getPropertyURI('external_link'), $href, $s_type, 'uri');
-      $this->addT($href, $this->getPropertyURI('title'), $sub_v['title'], $s_type, 'literal');
-    }
-  }
-
-  function extractWebPresencesRDF($s, $s_type, $v) {
-    foreach ($v as $sub_v) {
-      $href = $sub_v['external_url'];
-      if (preg_match('/^https?\:\/\/[^\/]+$/', $href)) $href .= '/';
-      $this->addT($s, $this->getPropertyURI('web_presence'), $href, $s_type, 'uri');
-      $this->addT($href, $this->getPropertyURI('title'), $sub_v['title'], $s_type, 'literal');
-    }
-  }
-
-  function extractCreatedAtRDF($s, $s_type,  $v) {
-    $v = $this->getAPIDateXSD($v);
-    $this->addT($s, $this->getPropertyURI('created_at'), $v, $s_type, 'literal');
-  }
-
-  function extractUpdatedAtRDF($s, $s_type,  $v) {
-    $v = $this->getAPIDateXSD($v);
-    $this->addT($s, $this->getPropertyURI('updated_at'), $v, $s_type, 'literal');
-  }
-
-  function getAPIDateXSD($val) {
-    //Fri Jan 16 21:11:48 UTC 2009
-    if (preg_match('/^[a-z]+ ([a-z]+) ([0-9]+) ([0-9]{2}\:[0-9]{2}\:[0-9]{2}) UTC ([0-9]{4})/i', $val, $m)) {
-      $months = array('Jan' => '01', 'Feb' => '02', 'Mar' =>'03', 'Apr' => '04', 'May' => '05', 'Jun' => '06', 'Jul' => '07', 'Aug' => '08', 'Sep' => '09', 'Oct' => '10', 'Nov' => '11', 'Dec' => '12');
-      return $m[4] . '-' . $months[$m[1]] . '-' . $m[2] . 'T' . $m[3] . 'Z';
-    }
-    return '2000-01-01';
-  }
-
-  /*  */
-
-  function inferDate($prefix, $s, $struct) {
-    $s_type = preg_match('/^\_\:/', $s) ? 'bnode' : 'uri';
-    $r = '';
-    foreach (array('year', 'month', 'day') as $suffix) {
-      $val = $this->v1($prefix . '_' . $suffix, '00', $struct);
-      $r .= ($r ? '-' : '') . str_pad($val, 2, '0', STR_PAD_LEFT);
-    }
-    if ($r != '00-00-00') {
-      $this->addT($s, $this->getPropertyURI($prefix . '_date'), $r, $s_type, 'literal');
-    }
-  }
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_JSONParser.php b/libraries/ARC2/parsers/ARC2_JSONParser.php
deleted file mode 100644
index 8f3aa174a..000000000
--- a/libraries/ARC2/parsers/ARC2_JSONParser.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * ARC2 JSON Parser
- * Does not extract triples, needs sub-class for RDF extraction
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-07
-*/
-
-ARC2::inc('RDFParser');
-
-class ARC2_JSONParser extends ARC2_RDFParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-  
-  /*  */
-
-  function x($re, $v, $options = 'si') {
-    while (preg_match('/^\s*(\/\*.*\*\/)(.*)$/Usi', $v, $m)) {/* comment removal */
-      $v = $m[2];
-    }
-    $this->unparsed_code = (strlen($this->unparsed_code) > strlen($v)) ? $v : $this->unparsed_code;
-    return ARC2::x($re, $v, $options);
-  }
-
-  function parse($path, $data = '') {
-    $this->state = 0;
-    /* reader */
-    if (!$this->v('reader')) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->setAcceptHeader('Accept: application/json; q=0.9, */*; q=0.1');
-    $this->reader->activate($path, $data);
-    $this->x_base = isset($this->a['base']) && $this->a['base'] ? $this->a['base'] : $this->reader->base;
-    /* parse */
-    $doc = '';
-    while ($d = $this->reader->readStream()) {
-      $doc .= $d;
-    }
-    $this->reader->closeStream();
-    unset($this->reader);
-    $doc = preg_replace('/^[^\{]*(.*\})[^\}]*$/is', '\\1', $doc);
-    $this->unparsed_code = $doc;
-    list($this->struct, $rest) = $this->extractObject($doc);
-    return $this->done();
-  }
-  
-  /*  */
-  
-  function extractObject($v) {
-    if (function_exists('json_decode')) return array(json_decode($v, 1), '');
-    $r = array();
-    /* sub-object */
-    if ($sub_r = $this->x('\{', $v)) {
-      $v = $sub_r[1];
-      while ((list($sub_r, $v) = $this->extractEntry($v)) && $sub_r) {
-        $r[$sub_r['key']] = $sub_r['value'];
-      }
-      if ($sub_r = $this->x('\}', $v)) $v = $sub_r[1];
-    }
-    /* sub-list */
-    elseif ($sub_r = $this->x('\[', $v)) {
-      $v = $sub_r[1];
-      while ((list($sub_r, $v) = $this->extractObject($v)) && $sub_r) {
-        $r[] = $sub_r;
-        $v = ltrim($v, ',');
-      }
-      if ($sub_r = $this->x('\]', $v)) $v = $sub_r[1];
-    }
-    /* sub-value */
-    elseif ((list($sub_r, $v) = $this->extractValue($v)) && ($sub_r !== false)) {
-      $r = $sub_r;
-    }
-    return array($r, $v);
-  }
-  
-  function extractEntry($v) {
-    if ($r = $this->x('\,', $v)) $v = $r[1];
-    /* k */
-    if ($r = $this->x('\"([^\"]+)\"\s*\:', $v)) {
-      $k = $r[1];
-      $sub_v = $r[2];
-      if (list($sub_r, $sub_v) = $this->extractObject($sub_v)) {
-        return array(
-          array('key' => $k, 'value' => $sub_r),
-          $sub_v
-        );
-      }
-    }
-    return array(0, $v);
-  }
-  
-  function extractValue($v) {
-    if ($r = $this->x('\,', $v)) $v = $r[1];
-    if ($sub_r = $this->x('null', $v)) {
-      return array(null, $sub_r[1]);
-    }
-    if ($sub_r = $this->x('(true|false)', $v)) {
-      return array($sub_r[1], $sub_r[2]);
-    }
-    if ($sub_r = $this->x('([\-\+]?[0-9\.]+)', $v)) {
-      return array($sub_r[1], $sub_r[2]);
-    }
-    if ($sub_r = $this->x('\"', $v)) {
-      $rest = $sub_r[1];
-      if (preg_match('/^([^\x5c]*|.*[^\x5c]|.*\x5c{2})\"(.*)$/sU', $rest, $m)) {
-        $val = $m[1];
-        /* unescape chars (single-byte) */
-        $val = preg_replace('/\\\u(.{4})/e', 'chr(hexdec("\\1"))', $val);
-        //$val = preg_replace('/\\\u00(.{2})/e', 'rawurldecode("%\\1")', $val);
-        /* other escaped chars */
-        $from = array('\\\\', '\r', '\t', '\n', '\"', '\b', '\f', '\/');
-        $to = array("\\", "\r", "\t", "\n", '"', "\b", "\f", "/");
-        $val = str_replace($from, $to, $val);
-        return array($val, $m[2]);
-      }
-    }
-    return array(false, $v);
-  }
-  
-  /*  */
-
-  function getObject() {
-    return $this->v('struct', array());
-  }
-  
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-  
-  function countTriples() {
-    return $this->t_count;
-  }
-
-  function addT($s = '', $p = '', $o = '', $s_type = '', $o_type = '', $o_dt = '', $o_lang = '') {
-    $o = $this->toUTF8($o);
-    //echo str_replace($this->base, '', "-----\n adding $s / $p / $o\n-----\n");
-    $t = array('s' => $s, 'p' => $p, 'o' => $o, 's_type' => $s_type, 'o_type' => $o_type, 'o_datatype' => $o_dt, 'o_lang' => $o_lang);
-    if ($this->skip_dupes) {
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_LegacyXMLParser.php b/libraries/ARC2/parsers/ARC2_LegacyXMLParser.php
deleted file mode 100644
index 227bfec6f..000000000
--- a/libraries/ARC2/parsers/ARC2_LegacyXMLParser.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Legaxy XML Parser
-author:   Benjamin Nowack
-version:  2008-10-04 (Fix: nsDecl led to warnings when uri was an array.)
-*/
-
-ARC2::inc('Class');
-
-class ARC2_LegacyXMLParser extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->encoding = $this->v('encoding', false, $this->a);
-    $this->state = 0;
-    $this->x_base = $this->base;
-    $this->xml = 'http://www.w3.org/XML/1998/namespace';
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->nsp = array($this->xml => 'xml', $this->rdf => 'rdf');
-    $this->allowCDataNodes = 1;
-    $this->target_encoding = '';
-    $this->keep_cdata_ws = $this->v('keep_cdata_whitespace', 0, $this->a);
-  }
-  
-  /*  */
-
-  function setReader(&$reader) {
-    $this->reader = $reader;
-  }
-
-  function parse($path, $data = '', $iso_fallback = false) {
-    $this->nodes = array();
-    $this->node_count = 0;
-    $this->level = 0;
-    /* reader */
-    if (!$this->v('reader')) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->setAcceptHeader('Accept: application/xml; q=0.9, */*; q=0.1');
-    $this->reader->activate($path, $data);
-    $this->x_base = isset($this->a['base']) && $this->a['base'] ? $this->a['base'] : $this->reader->base;
-    $this->base = $this->x_base;
-    $this->doc_url = $this->reader->base;
-    /* xml parser */
-    $this->initXMLParser();
-    /* parse */
-    $first = true;
-    while ($d = $this->reader->readStream(1)) {
-      if ($iso_fallback && $first) {
-        $d = '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . preg_replace('/^\<\?xml [^\>]+\?\>\s*/s', '', $d);
-      }
-      if (!xml_parse($this->xml_parser, $d, false)) {
-        $error_str = xml_error_string(xml_get_error_code($this->xml_parser));
-        $line = xml_get_current_line_number($this->xml_parser);
-        if (!$iso_fallback && preg_match("/Invalid character/i", $error_str)) {
-          xml_parser_free($this->xml_parser);
-          unset($this->xml_parser);
-          $this->reader->closeStream();
-          unset($this->reader);
-          $this->__init();
-          $this->encoding = 'ISO-8859-1';
-          $this->initXMLParser();
-          return $this->parse($path, $data, true);
-        }
-        else {
-          return $this->addError('XML error: "' . $error_str . '" at line ' . $line . ' (parsing as ' . $this->getEncoding() . ')');
-        }
-      }
-      $first = false;
-    }
-    $this->target_encoding = xml_parser_get_option($this->xml_parser, XML_OPTION_TARGET_ENCODING);
-    xml_parser_free($this->xml_parser);
-    $this->reader->closeStream();
-    unset($this->reader);
-    return $this->done();
-  }
-  
-  /*  */
-  
-  function getEncoding($src = 'config') {
-    if ($src == 'parser') {
-      return $this->target_encoding;
-    }
-    elseif (($src == 'config') && $this->encoding) {
-      return $this->encoding;
-    }
-    return $this->reader->getEncoding();
-  }
-
-  /*  */
-  
-  function done() {
-  
-  }
-  
-  /*  */
-  
-  function getStructure() {
-    return array('nodes' => $this->v('nodes', array()));
-  }
-  
-  /*  */
-
-  function getNodeIndex(){
-    if (!isset($this->node_index)) {
-      /* index by parent */
-      $index = array();
-      for ($i = 0, $i_max = count($this->nodes); $i < $i_max; $i++) {
-        $node = $this->nodes[$i];
-        $node['id'] = $i;
-        $node['doc_base'] = $this->base;
-        if (isset($this->doc_url)) $node['doc_url'] = $this->doc_url;
-        $this->updateNode($node);
-        $p_id = $node['p_id'];
-        if (!isset($index[$p_id])) {
-          $index[$p_id] = array();
-        }
-        $index[$p_id][$node['pos']] = $node;
-      }
-      $this->node_index = $index;
-    }
-    return $this->node_index;
-  }
-
-  function getNodes() {
-    return $this->nodes;
-  }
-  
-  function getSubNodes($n) {
-    return $this->v($n['id'], array(), $this->getNodeIndex());
-  }
-  
-  function getNodeContent($n, $outer = 0, $trim = 1) {
-    //echo '<pre>' . htmlspecialchars(print_r($n, 1)) . '</pre>';
-    if ($n['tag'] == 'cdata') {
-      $r = $n['a']['value'];
-    }
-    else {
-      $r = '';
-      if ($outer) {
-        $r .= '<' . $n['tag'];
-        asort($n['a']);
-        if (isset($n['a']['xmlns']) && $n['a']['xmlns']['']) {
-          $r .= ' xmlns="' . $n['a']['xmlns'][''] . '"';
-        }
-        foreach ($n['a'] as $a => $val) {
-          $r .= preg_match('/^[^\s]+$/', $a) && !is_array($val) ? ' ' . $a . '="' . addslashes($val) . '"' : '';
-        }
-        $r .= $n['empty'] ? '/>' : '>';
-      }
-      if (!$n['empty']) {
-        $r .= $this->v('cdata', '', $n);
-        $sub_nodes = $this->getSubNodes($n);
-        foreach ($sub_nodes as $sub_n) {
-          $r .= $this->getNodeContent($sub_n, 1, 0);
-        }
-        if ($outer) {
-          $r .= '</' . $n['tag'] . '>';
-        }
-      }
-    }
-    return ($trim && !$this->keep_cdata_ws) ? trim($r) : $r;
-  }
-
-  /*  */
-  
-  function pushNode($n) {
-    $n['id'] = $this->node_count;
-    $this->nodes[$this->node_count] = $n;
-    $this->node_count++;
-  }
-  
-  function getCurNode($t = '') {
-    $i = 1;
-    do {
-      $r = $this->node_count ? $this->nodes[$this->node_count - $i] : 0;
-      $found = (!$t || ($r['tag'] == $t)) ? 1 : 0;
-      $i++;
-    } while (!$found && isset($this->nodes[$this->node_count - $i]));
-    return $r;
-  }
-  
-  function updateNode($node) {/* php4-save */
-    $this->nodes[$node['id']] = $node;
-  }
-
-  /*  */
-
-  function initXMLParser() {
-    if (!isset($this->xml_parser)) {
-      $enc = preg_match('/^(utf\-8|iso\-8859\-1|us\-ascii)$/i', $this->getEncoding(), $m) ? $m[1] : 'UTF-8';
-      $parser = xml_parser_create_ns($enc, '');
-      xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
-      xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-      xml_set_element_handler($parser, 'open', 'close');
-      xml_set_character_data_handler($parser, 'cData');
-      xml_set_start_namespace_decl_handler($parser, 'nsDecl');
-      xml_set_object($parser, $this);
-      $this->xml_parser = $parser;
-    }
-  }
-
-  /*  */
-  
-  function open($p, $t, $a) {
-    $t_exact = $t;
-    //echo "<br />\n".'opening '.$t . ' ' . print_r($a, 1); flush();
-    //echo "<br />\n".'opening '.$t; flush();
-    $t = strpos($t, ':') ? $t : strtolower($t);
-    /* base check */
-    $base = '';
-    if (($t == 'base') && isset($a['href'])) {
-      $this->base = $a['href'];
-      $base = $a['href'];
-    }
-    /* URIs */
-    foreach (array('href', 'src', 'id') as $uri_a) {
-      if (isset($a[$uri_a])) {
-        $a[$uri_a . ' uri'] = ($uri_a == 'id') ? $this->calcURI('#'.$a[$uri_a]) : $this->calcURI($a[$uri_a]);
-      }
-    }
-    /* ns */
-    if ($a) {
-      foreach ($a as $k => $v) {
-        if (strpos($k, 'xmlns') === 0) {
-          $this->nsDecl($p, trim(substr($k, 5), ':'), $v);
-        }
-      }
-    }
-    /* node */
-    $node = array(
-      'tag' => $t,
-      'tag_exact' => $t_exact,
-      'a' => $a, 
-      'level' => $this->level, 
-      'pos' => 0,
-      'p_id' => $this->node_count-1,
-      'state' => 'open',
-      'empty' => 0,
-      'cdata' =>''
-    );
-    if ($base) {
-      $node['base'] = $base;
-    }
-    /* parent/sibling */
-    if ($this->node_count) {
-      $l = $this->level;
-      $prev_node = $this->getCurNode();
-      if ($prev_node['level'] == $l) {
-        $node['p_id'] = $prev_node['p_id'];
-        $node['pos'] = $prev_node['pos']+1;
-      }
-      elseif($prev_node['level'] > $l) {
-        while($prev_node['level'] > $l) {
-          if (!isset($this->nodes[$prev_node['p_id']])) {
-            //$this->addError('nesting mismatch: tag is ' . $t . ', level is ' . $l . ', prev_level is ' . $prev_node['level'] . ', prev_node p_id is ' . $prev_node['p_id']);
-            break;
-          }
-          $prev_node = $this->nodes[$prev_node['p_id']];
-        }
-        $node['p_id'] = $prev_node['p_id'];
-        $node['pos'] = $prev_node['pos']+1;
-      }
-    }
-    $this->pushNode($node);
-    $this->level++;
-    /* cdata */
-    $this->cur_cdata="";
-  }
-
-  function close($p, $t, $empty = 0) {
-    //echo "<br />\n".'closing '.$t; flush();
-    $node = $this->getCurNode($t);
-    $node['state'] = 'closed';
-    $node['empty'] = $empty;
-    $this->updateNode($node);
-    $this->level--;
-  }
-
-  function cData($p, $d) {
-    //echo trim($d) ? "<br />\n".'cdata: ' . $d : ''; flush();
-    $node = $this->getCurNode();
-    if($node['state'] == 'open') {
-      $node['cdata'] .= $d;
-      $this->updateNode($node);
-    }
-    else {/* cdata is sibling of node */
-      if ($this->allowCDataNodes) {
-        $this->open($p, 'cdata', array('value' => $d));
-        $this->close($p, 'cdata');
-      }
-    }
-  }
-  
-  function nsDecl($p, $prf, $uri) {
-    if (is_array($uri)) return 1;
-    $this->ns[$prf] = $uri;
-    $this->nsp[$uri] = isset($this->nsp[$uri]) ? $this->nsp[$uri] : $prf;
-  }
-
-  /*  */
-  
-}
\ No newline at end of file
diff --git a/libraries/ARC2/parsers/ARC2_RDFParser.php b/libraries/ARC2/parsers/ARC2_RDFParser.php
deleted file mode 100644
index 7a0022a15..000000000
--- a/libraries/ARC2/parsers/ARC2_RDFParser.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * ARC2 RDF Parser (generic)
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2009-12-03
-*/
-
-ARC2::inc('Class');
-
-class ARC2_RDFParser extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* proxy_host, proxy_port, proxy_skip, http_accept_header, http_user_agent_header, max_redirects, reader, skip_dupes */
-    parent::__init();
-    $this->a['format'] = $this->v('format', false, $this->a);
-    $this->keep_time_limit = $this->v('keep_time_limit', 0, $this->a);
-    $this->triples = array();
-    $this->t_count = 0;
-    $this->added_triples = array();
-    $this->skip_dupes = $this->v('skip_dupes', false, $this->a);
-    $this->bnode_prefix = $this->v('bnode_prefix', 'arc'.substr(md5(uniqid(rand())), 0, 4).'b', $this->a);
-    $this->bnode_id = 0;
-    $this->format = '';
-  }
-
-  /*  */
-  
-  function setReader(&$reader) {
-    $this->reader = $reader;
-  }
-  
-  function parse($path, $data = '') {
-    /* reader */
-    if (!isset($this->reader)) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->activate($path, $data) ;
-    /* format detection */
-    $mappings = array(
-      'rdfxml' => 'RDFXML', 
-      'turtle' => 'Turtle', 
-      'sparqlxml' => 'SPOG', 
-      'ntriples' => 'Turtle', 
-      'html' => 'SemHTML',
-      'rss' => 'RSS',
-      'atom' => 'Atom',
-      'sgajson' => 'SGAJSON',
-      'cbjson' => 'CBJSON'
-    );
-    $format = $this->reader->getFormat();
-    if (!$format || !isset($mappings[$format])) {
-      return $this->addError('No parser available for "' . $format . '".');
-    }
-    $this->format = $format;
-    /* format parser */
-    $suffix = $mappings[$format] . 'Parser';
-    ARC2::inc($suffix);
-    $cls = 'ARC2_' . $suffix;
-    $this->parser = new $cls($this->a, $this);
-    $this->parser->setReader($this->reader);
-    return $this->parser->parse($path, $data);
-  }
-  
-  function parseData($data) {
-    return $this->parse(ARC2::getScriptURI(), $data);
-  }
-  
-  /*  */
-
-  function done() {
-  }
-
-  /*  */
-  
-  function createBnodeID(){
-    $this->bnode_id++;
-    return '_:' . $this->bnode_prefix . $this->bnode_id;
-  }
-
-  function getTriples() {
-    return $this->v('parser') ? $this->m('getTriples', false, array(), $this->v('parser')) : array();
-  }
-  
-  function countTriples() {
-    return $this->v('parser') ? $this->m('countTriples', false, 0, $this->v('parser')) : 0;
-  }
-  
-  function getSimpleIndex($flatten_objects = 1, $vals = '') {
-    return ARC2::getSimpleIndex($this->getTriples(), $flatten_objects, $vals);
-  }
-  
-  function reset() {
-    $this->__init();
-    if (isset($this->reader)) unset($this->reader);
-    if (isset($this->parser)) {
-      $this->parser->__init();
-      unset($this->parser);
-    }
-  }
-  
-  /*  */
-  
-  function extractRDF($formats = '') {
-    if (method_exists($this->parser, 'extractRDF')) {
-      return $this->parser->extractRDF($formats);
-    }
-  }
-  
-  /*  */
-  
-  function getEncoding($src = 'config') {
-    if (method_exists($this->parser, 'getEncoding')) {
-      return $this->parser->getEncoding($src);
-    }
-  }
-
-  /**
-   * returns the array of namespace prefixes encountered during parsing
-   * @return array (keys = namespace URI / values = prefix used)
-  */
-
-  function getParsedNamespacePrefixes() {
-    if (isset($this->parser)) {
-      return $this->v('nsp', array(), $this->parser);
-    }
-    return $this->v('nsp', array());
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/parsers/ARC2_RDFXMLParser.php b/libraries/ARC2/parsers/ARC2_RDFXMLParser.php
deleted file mode 100644
index 7cbb68017..000000000
--- a/libraries/ARC2/parsers/ARC2_RDFXMLParser.php
+++ /dev/null
@@ -1,641 +0,0 @@
-<?php
-/**
- * ARC2 RDF/XML Parser
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2009-12-03
-*/
-
-ARC2::inc('RDFParser');
-
-class ARC2_RDFXMLParser extends ARC2_RDFParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->encoding = $this->v('encoding', false, $this->a);
-    $this->state = 0;
-    $this->x_lang = '';
-    $this->x_base = $this->base;
-    $this->xml = 'http://www.w3.org/XML/1998/namespace';
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->nsp = array($this->xml => 'xml', $this->rdf => 'rdf');
-    $this->s_stack = array();
-    $this->s_count = 0;
-    $this->target_encoding = '';
-  }
-  
-  /*  */
-
-  function parse($path, $data = '', $iso_fallback = false) {
-    /* reader */
-    if (!$this->v('reader')) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->setAcceptHeader('Accept: application/rdf+xml; q=0.9, */*; q=0.1');
-    $this->reader->activate($path, $data);
-    $this->x_base = isset($this->a['base']) && $this->a['base'] ? $this->a['base'] : $this->reader->base;
-    /* xml parser */
-    $this->initXMLParser();
-    /* parse */
-    $first = true;
-    while ($d = $this->reader->readStream()) {
-      if (!$this->keep_time_limit) @set_time_limit($this->v('time_limit', 60, $this->a));
-      if ($iso_fallback && $first) {
-        $d = '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . preg_replace('/^\<\?xml [^\>]+\?\>\s*/s', '', $d);
-        $first = false;
-      }
-      if (!xml_parse($this->xml_parser, $d, false)) {
-        $error_str = xml_error_string(xml_get_error_code($this->xml_parser));
-        $line = xml_get_current_line_number($this->xml_parser);
-        $this->tmp_error = 'XML error: "' . $error_str . '" at line ' . $line . ' (parsing as ' . $this->getEncoding() . ')';
-        if (!$iso_fallback && preg_match("/Invalid character/i", $error_str)) {
-          xml_parser_free($this->xml_parser);
-          unset($this->xml_parser);
-          $this->reader->closeStream();
-          $this->__init();
-          $this->encoding = 'ISO-8859-1';
-          unset($this->xml_parser);
-          unset($this->reader);
-          return $this->parse($path, $data, true);
-        }
-        else {
-          return $this->addError($this->tmp_error);
-        }
-      }
-    }
-    $this->target_encoding = xml_parser_get_option($this->xml_parser, XML_OPTION_TARGET_ENCODING);
-    xml_parser_free($this->xml_parser);
-    $this->reader->closeStream();
-    unset($this->reader);
-    return $this->done();
-  }
-  
-  /*  */
-  
-  function initXMLParser() {
-    if (!isset($this->xml_parser)) {
-      $enc = preg_match('/^(utf\-8|iso\-8859\-1|us\-ascii)$/i', $this->getEncoding(), $m) ? $m[1] : 'UTF-8';
-      $parser = xml_parser_create_ns($enc, '');
-      xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
-      xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-      xml_set_element_handler($parser, 'open', 'close');
-      xml_set_character_data_handler($parser, 'cdata');
-      xml_set_start_namespace_decl_handler($parser, 'nsDecl');
-      xml_set_object($parser, $this);
-      $this->xml_parser = $parser;
-    }
-  }
-
-  /*  */
-  
-  function getEncoding($src = 'config') {
-    if ($src == 'parser') {
-      return $this->target_encoding;
-    }
-    elseif (($src == 'config') && $this->encoding) {
-      return $this->encoding;
-    }
-    return $this->reader->getEncoding();
-  }
-  
-  /*  */
-  
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-  
-  function countTriples() {
-    return $this->t_count;
-  }
-
-  /*  */
-  
-  function pushS(&$s) {
-    $s['pos'] = $this->s_count;
-    $this->s_stack[$this->s_count] = $s;
-    $this->s_count++;
-  }
-  
-  function popS(){/* php 4.0.x-safe */
-    $r = array();
-    $this->s_count--;
-    for ($i = 0, $i_max = $this->s_count; $i < $i_max; $i++) {
-      $r[$i] = $this->s_stack[$i];
-    }
-    $this->s_stack = $r;
-  }
-  
-  function updateS($s) {
-    $this->s_stack[$s['pos']] = $s;
-  }
-  
-  function getParentS() {
-    return ($this->s_count && isset($this->s_stack[$this->s_count - 1])) ? $this->s_stack[$this->s_count - 1] : false;
-  }
-  
-  function getParentXBase() {
-    if ($p = $this->getParentS()) {
-      return isset($p['p_x_base']) && $p['p_x_base'] ? $p['p_x_base'] : (isset($p['x_base']) ? $p['x_base'] : '');
-    }
-    return $this->x_base;
-  }
-
-  function getParentXLang() {
-    if ($p = $this->getParentS()) {
-      return isset($p['p_x_lang']) && $p['p_x_lang'] ? $p['p_x_lang'] : (isset($p['x_lang']) ? $p['x_lang'] : '');
-    }
-    return $this->x_lang;
-  }
-
-  /*  */
-  
-  function addT($s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '') {
-    //echo "-----\nadding $s / $p / $o\n-----\n";
-    $t = array('s' => $s, 'p' => $p, 'o' => $o, 's_type' => $s_type, 'o_type' => $o_type, 'o_datatype' => $o_dt, 'o_lang' => $o_lang);
-    if ($this->skip_dupes) {
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  function reify($t, $s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '') {
-    $this->addT($t, $this->rdf.'type', $this->rdf.'Statement', 'uri', 'uri');
-    $this->addT($t, $this->rdf.'subject', $s, 'uri', $s_type);
-    $this->addT($t, $this->rdf.'predicate', $p, 'uri', 'uri');
-    $this->addT($t, $this->rdf.'object', $o, 'uri', $o_type, $o_dt, $o_lang);
-  }
-  
-  /*  */
-  
-  function open($p, $t, $a) {
-    //echo "state is $this->state\n";
-    //echo "opening $t\n";
-    switch($this->state) {
-      case 0: return $this->h0Open($t, $a);
-      case 1: return $this->h1Open($t, $a);
-      case 2: return $this->h2Open($t, $a);
-      case 4: return $this->h4Open($t, $a);
-      case 5: return $this->h5Open($t, $a);
-      case 6: return $this->h6Open($t, $a);
-      default: $this->addError('open() called at state ' . $this->state . ' in '.$t);
-    }
-  }
-
-  function close($p, $t) {
-    //echo "state is $this->state\n";
-    //echo "closing $t\n";
-    switch($this->state){
-      case 1: return $this->h1Close($t);
-      case 2: return $this->h2Close($t);
-      case 3: return $this->h3Close($t);
-      case 4: return $this->h4Close($t);
-      case 5: return $this->h5Close($t);
-      case 6: return $this->h6Close($t);
-      default: $this->addError('close() called at state ' . $this->state . ' in '.$t);
-    }
-  }
-
-  function cdata($p, $d) {
-    //echo "state is $this->state\n";
-    //echo "cdata\n";
-    switch($this->state){
-      case 4: return $this->h4Cdata($d);
-      case 6: return $this->h6Cdata($d);
-      default: return false;
-    }
-  }
-  
-  function nsDecl($p, $prf, $uri) {
-    $this->nsp[$uri] = isset($this->nsp[$uri]) ? $this->nsp[$uri] : $prf;
-  }
-
-  /*  */
-  
-  function h0Open($t, $a) {
-    $this->x_lang = $this->v($this->xml.'lang', $this->x_lang, $a);
-    $this->x_base = $this->calcURI($this->v($this->xml.'base', $this->x_base, $a));
-    $this->state = 1;
-    if ($t !== $this->rdf.'RDF') {
-      $this->h1Open($t, $a);
-    }
-  }
-  
-  /*  */
-
-  function h1Open($t, $a) {
-    $s = array(
-      'x_base' => isset($a[$this->xml.'base']) ? $this->calcURI($a[$this->xml.'base']) : $this->getParentXBase(), 
-      'x_lang' => isset($a[$this->xml.'lang']) ? $a[$this->xml.'lang'] : $this->getParentXLang(),
-      'li_count' => 0,
-    );
-    /* ID */
-    if (isset($a[$this->rdf.'ID'])) {
-      $s['type'] = 'uri';
-      $s['value'] = $this->calcURI('#'.$a[$this->rdf.'ID'], $s['x_base']);
-    }
-    /* about */
-    elseif (isset($a[$this->rdf.'about'])) {
-      $s['type'] = 'uri';
-      $s['value'] = $this->calcURI($a[$this->rdf.'about'], $s['x_base']);
-    }
-    /* bnode */
-    else {
-      $s['type'] = 'bnode';
-      if (isset($a[$this->rdf.'nodeID'])) {
-        $s['value'] = '_:'.$a[$this->rdf.'nodeID'];
-      }
-      else {
-        $s['value'] = $this->createBnodeID();
-      }
-    }
-    /* sub-node */
-    if ($this->state === 4) {
-      $sup_s = $this->getParentS();
-      /* new collection */
-      if (isset($sup_s['o_is_coll']) && $sup_s['o_is_coll']) {
-        $coll = array('value' => $this->createBnodeID(), 'type' => 'bnode', 'is_coll' => true, 'x_base' => $s['x_base'], 'x_lang' => $s['x_lang']);
-        $this->addT($sup_s['value'], $sup_s['p'], $coll['value'], $sup_s['type'], $coll['type']);
-        $this->addT($coll['value'], $this->rdf . 'first', $s['value'], $coll['type'], $s['type']);
-        $this->pushS($coll);
-      }
-      /* new entry in existing coll */
-      elseif (isset($sup_s['is_coll']) && $sup_s['is_coll']) {
-        $coll = array('value' => $this->createBnodeID(), 'type' => 'bnode', 'is_coll' => true, 'x_base' => $s['x_base'], 'x_lang' => $s['x_lang']);
-        $this->addT($sup_s['value'], $this->rdf . 'rest', $coll['value'], $sup_s['type'], $coll['type']);
-        $this->addT($coll['value'], $this->rdf . 'first', $s['value'], $coll['type'], $s['type']);
-        $this->pushS($coll);
-      }
-      /* normal sub-node */
-      elseif(isset($sup_s['p']) && $sup_s['p']) {
-        $this->addT($sup_s['value'], $sup_s['p'], $s['value'], $sup_s['type'], $s['type']);
-      }
-    }
-    /* typed node */
-    if ($t !== $this->rdf.'Description') {
-      $this->addT($s['value'], $this->rdf.'type', $t, $s['type'], 'uri');
-    }
-    /* (additional) typing attr */
-    if (isset($a[$this->rdf.'type'])) {
-      $this->addT($s['value'], $this->rdf.'type', $a[$this->rdf.'type'], $s['type'], 'uri');
-    }
-    /* Seq|Bag|Alt */
-    if (in_array($t, array($this->rdf.'Seq', $this->rdf.'Bag', $this->rdf.'Alt'))) {
-      $s['is_con'] = true;
-    }
-    /* any other attrs (skip rdf and xml, except rdf:_, rdf:value, rdf:Seq) */
-    foreach($a as $k => $v) {
-      if (((strpos($k, $this->xml) === false) && (strpos($k, $this->rdf) === false)) || preg_match('/(\_[0-9]+|value|Seq|Bag|Alt|Statement|Property|List)$/', $k)) {
-        if (strpos($k, ':')) {
-          $this->addT($s['value'], $k, $v, $s['type'], 'literal', '', $s['x_lang']);
-        }
-      }
-    }
-    $this->pushS($s);
-    $this->state = 2;
-  }
-
-  /*  */
-
-  function h2Open($t, $a) {
-    $s = $this->getParentS();
-    foreach (array('p_x_base', 'p_x_lang', 'p_id', 'o_is_coll') as $k) {
-      unset($s[$k]);
-    }
-    /* base */
-    if (isset($a[$this->xml.'base'])) {
-      $s['p_x_base'] = $this->calcURI($a[$this->xml.'base'], $s['x_base']);
-    }
-    $b = isset($s['p_x_base']) && $s['p_x_base'] ? $s['p_x_base'] : $s['x_base'];
-    /* lang */
-    if (isset($a[$this->xml.'lang'])) {
-      $s['p_x_lang'] = $a[$this->xml.'lang'];
-    }
-    $l = isset($s['p_x_lang']) && $s['p_x_lang'] ? $s['p_x_lang'] : $s['x_lang'];
-    /* adjust li */
-    if ($t === $this->rdf.'li') {
-      $s['li_count']++;
-      $t = $this->rdf.'_'.$s['li_count'];
-    }
-    /* set p */
-    $s['p'] = $t;
-		/* reification */
-    if (isset($a[$this->rdf.'ID'])) {
-      $s['p_id'] = $a[$this->rdf.'ID'];
-    }
-    $o = array('value' => '', 'type' => '', 'x_base' => $b, 'x_lang' => $l);
-    /* resource/rdf:resource */
-    if (isset($a['resource'])) {
-      $a[$this->rdf . 'resource'] = $a['resource'];
-      unset($a['resource']);
-    }
-    if (isset($a[$this->rdf.'resource'])) {
-      $o['value'] = $this->calcURI($a[$this->rdf.'resource'], $b);
-      $o['type'] = 'uri';
-      $this->addT($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-      /* type */
-      if (isset($a[$this->rdf.'type'])) {
-        $this->addT($o['value'], $this->rdf.'type', $a[$this->rdf.'type'], 'uri', 'uri');
-      }
-      /* reification */
-      if (isset($s['p_id'])) {
-        $this->reify($this->calcURI('#'.$s['p_id'], $b), $s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-        unset($s['p_id']);
-      }
-      $this->state = 3;
-    }
-    /* named bnode */
-    elseif (isset($a[$this->rdf.'nodeID'])) {
-      $o['value'] = '_:' . $a[$this->rdf.'nodeID'];
-      $o['type'] = 'bnode';
-      $this->addT($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-      $this->state = 3;
-      /* reification */
-      if (isset($s['p_id'])) {
-        $this->reify($this->calcURI('#'.$s['p_id'], $b), $s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-      }
-    }
-    /* parseType */
-    elseif (isset($a[$this->rdf.'parseType'])) {
-      if ($a[$this->rdf.'parseType'] === 'Literal') {
-        $s['o_xml_level'] = 0;
-        $s['o_xml_data'] = '';
-        $s['p_xml_literal_level'] = 0;
-        $s['ns'] = array();
-        $this->state = 6;
-      }
-      elseif ($a[$this->rdf.'parseType'] === 'Resource') {
-        $o['value'] = $this->createBnodeID();
-        $o['type'] = 'bnode';
-        $o['has_closing_tag'] = 0;
-        $this->addT($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-        $this->pushS($o);
-        /* reification */
-        if (isset($s['p_id'])) {
-          $this->reify($this->calcURI('#'.$s['p_id'], $b), $s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-          unset($s['p_id']);
-        }
-        $this->state = 2;
-      }
-      elseif ($a[$this->rdf.'parseType'] === 'Collection') {
-        $s['o_is_coll'] = true;
-        $this->state = 4;
-      }
-    }
-    /* sub-node or literal */
-    else {
-      $s['o_cdata'] = '';
-      if (isset($a[$this->rdf.'datatype'])) {
-        $s['o_datatype'] = $a[$this->rdf.'datatype'];
-      }
-      $this->state = 4;
-    }
-    /* any other attrs (skip rdf and xml) */
-    foreach($a as $k => $v) {
-      if (((strpos($k, $this->xml) === false) && (strpos($k, $this->rdf) === false)) || preg_match('/(\_[0-9]+|value)$/', $k)) {
-        if (strpos($k, ':')) {
-          if (!$o['value']) {
-            $o['value'] = $this->createBnodeID();
-            $o['type'] = 'bnode';
-            $this->addT($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-          }
-          /* reification */
-          if (isset($s['p_id'])) {
-            $this->reify($this->calcURI('#'.$s['p_id'], $b), $s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-            unset($s['p_id']);
-          }
-          $this->addT($o['value'], $k, $v, $o['type'], 'literal');
-          $this->state = 3;
-        }
-      }
-    }
-    $this->updateS($s);
-  }
-
-  /*  */
-
-  function h4Open($t, $a) {
-    return $this->h1Open($t, $a);
-  }
-  
-  /*  */
-
-  function h5Open($t, $a) {
-    $this->state = 4;
-    return $this->h4Open($t, $a);
-  }
-  
-  /*  */
-  
-  function h6Open($t, $a) {
-    $s = $this->getParentS();
-    $data = isset($s['o_xml_data']) ? $s['o_xml_data'] : '';
-    $ns = isset($s['ns']) ? $s['ns'] : array();
-    $parts = $this->splitURI($t);
-    if (count($parts) === 1) {
-      $data .= '<'.$t;
-    }
-    else {
-      $ns_uri = $parts[0];
-      $name = $parts[1];
-      if (!isset($this->nsp[$ns_uri])) {
-        foreach ($this->nsp as $tmp1 => $tmp2) {
-          if (strpos($t, $tmp1) === 0) {
-            $ns_uri = $tmp1;
-            $name = substr($t, strlen($tmp1));
-            break;
-          }
-        }
-      }
-      $nsp = $this->nsp[$ns_uri];
-      $data .= $nsp ? '<' . $nsp . ':' . $name : '<' . $name;
-      /* ns */
-      if (!isset($ns[$nsp.'='.$ns_uri]) || !$ns[$nsp.'='.$ns_uri]) {
-        $data .= $nsp ? ' xmlns:'.$nsp.'="'.$ns_uri.'"' : ' xmlns="'.$ns_uri.'"';
-        $ns[$nsp.'='.$ns_uri] = true;
-        $s['ns'] = $ns;
-      }
-    }
-    foreach ($a as $k => $v) {
-      $parts = $this->splitURI($k);
-      if (count($parts) === 1) {
-        $data .= ' '.$k.'="'.$v.'"';
-      }
-      else {
-        $ns_uri = $parts[0];
-        $name = $parts[1];
-        $nsp = $this->v($ns_uri, '', $this->nsp);
-        $data .= $nsp ? ' '.$nsp.':'.$name.'="'.$v.'"' : ' '.$name.'="'.$v.'"' ;
-      }
-    }
-    $data .= '>';
-    $s['o_xml_data'] = $data;
-    $s['o_xml_level'] = isset($s['o_xml_level']) ? $s['o_xml_level'] + 1 : 1;
-    if ($t == $s['p']) {/* xml container prop */
-      $s['p_xml_literal_level'] = isset($s['p_xml_literal_level']) ? $s['p_xml_literal_level'] + 1 : 1;
-    }
-    $this->updateS($s);
-  }
-
-  /*  */
-
-  function h1Close($t) {/* end of doc */
-    $this->state = 0;
-  }
-  
-  /*  */
-  
-  function h2Close($t) {/* expecting a prop, getting a close */
-    if ($s = $this->getParentS()) {
-      $has_closing_tag = (isset($s['has_closing_tag']) && !$s['has_closing_tag']) ? 0 : 1;
-      $this->popS();
-      $this->state = 5;
-      if ($s = $this->getParentS()) {/* new s */
-        if (!isset($s['p']) || !$s['p']) {/* p close after collection|parseType=Resource|node close after p close */
-          $this->state = $this->s_count ? 4 : 1;
-          if (!$has_closing_tag) {
-            $this->state = 2;
-          }
-        }
-        elseif (!$has_closing_tag) {
-          $this->state = 2;
-        }
-      }
-    }
-  }
-  
-  /*  */
-  
-  function h3Close($t) {/* p close */
-    $this->state = 2;
-  }
-  
-  /*  */
-  
-  function h4Close($t) {/* empty p | pClose after cdata | pClose after collection */
-    if ($s = $this->getParentS()) {
-      $b = isset($s['p_x_base']) && $s['p_x_base'] ? $s['p_x_base'] : (isset($s['x_base']) ? $s['x_base'] : '');
-      if (isset($s['is_coll']) && $s['is_coll']) {
-        $this->addT($s['value'], $this->rdf . 'rest', $this->rdf . 'nil', $s['type'], 'uri');
-        /* back to collection start */
-        while ((!isset($s['p']) || ($s['p'] != $t))) {
-          $sub_s = $s;
-          $this->popS();
-          $s = $this->getParentS();
-        }
-        /* reification */
-        if (isset($s['p_id']) && $s['p_id']) {
-          $this->reify($this->calcURI('#'.$s['p_id'], $b), $s['value'], $s['p'], $sub_s['value'], $s['type'], $sub_s['type']);
-        }
-        unset($s['p']);
-        $this->updateS($s);
-      }
-      else {
-        $dt = isset($s['o_datatype']) ? $s['o_datatype'] : '';
-        $l = isset($s['p_x_lang']) && $s['p_x_lang'] ? $s['p_x_lang'] : (isset($s['x_lang']) ? $s['x_lang'] : '');
-        $o = array('type' => 'literal', 'value' => $s['o_cdata']);
-        $this->addT($s['value'], $s['p'], $o['value'], $s['type'], $o['type'], $dt, $l);
-        /* reification */
-        if (isset($s['p_id']) && $s['p_id']) {
-          $this->reify($this->calcURI('#'.$s['p_id'], $b), $s['value'], $s['p'], $o['value'], $s['type'], $o['type'], $dt, $l);
-        }
-        unset($s['o_cdata']);
-        unset($s['o_datatype']);
-        unset($s['p']);
-        $this->updateS($s);
-      }
-      $this->state = 2;
-    }
-  }
-  
-  /*  */
-  
-  function h5Close($t) {/* p close */
-    if ($s = $this->getParentS()) {
-      unset($s['p']);
-      $this->updateS($s);
-      $this->state = 2;
-    }
-  }
-
-  /*  */
-
-  function h6Close($t) {
-    if ($s = $this->getParentS()) {
-      $l = isset($s['p_x_lang']) && $s['p_x_lang'] ? $s['p_x_lang'] : (isset($s['x_lang']) ? $s['x_lang'] : '');
-      $data = $s['o_xml_data'];
-      $level = $s['o_xml_level'];
-      if ($level === 0) {/* pClose */
-        $this->addT($s['value'], $s['p'], trim($data, ' '), $s['type'], 'literal', $this->rdf.'XMLLiteral', $l);
-        unset($s['o_xml_data']);
-        $this->state = 2;
-      }
-      else {
-        $parts = $this->splitURI($t);
-        if (count($parts) == 1) {
-          $data .= '</'.$t.'>';
-        }
-        else {
-          $ns_uri = $parts[0];
-          $name = $parts[1];
-          if (!isset($this->nsp[$ns_uri])) {
-            foreach ($this->nsp as $tmp1 => $tmp2) {
-              if (strpos($t, $tmp1) === 0) {
-                $ns_uri = $tmp1;
-                $name = substr($t, strlen($tmp1));
-                break;
-              }
-            }
-          }
-          $nsp = $this->nsp[$ns_uri];
-          $data .= $nsp ? '</'.$nsp.':'.$name.'>' : '</'.$name.'>';
-        }
-        $s['o_xml_data'] = $data;
-        $s['o_xml_level'] = $level - 1;
-        if ($t == $s['p']) {/* xml container prop */
-          $s['p_xml_literal_level']--;
-        }
-      }
-      $this->updateS($s);
-    }
-  }
-  
-  /*  */
-  
-  function h4Cdata($d) {
-    if ($s = $this->getParentS()) {
-      $s['o_cdata'] = isset($s['o_cdata']) ? $s['o_cdata'] . $d : $d;
-      $this->updateS($s);
-    }
-  }
-  
-  /*  */
-
-  function h6Cdata($d) {
-    if ($s = $this->getParentS()) {
-      if (isset($s['o_xml_data']) || preg_match("/[\n\r]/", $d) || trim($d)) {
-        $d = htmlspecialchars($d, ENT_NOQUOTES);
-        $s['o_xml_data'] = isset($s['o_xml_data']) ? $s['o_xml_data'] . $d : $d;
-      }
-      $this->updateS($s);
-    }
-  }
-  
-  /*  */
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_RSSParser.php b/libraries/ARC2/parsers/ARC2_RSSParser.php
deleted file mode 100644
index e50e0cd4f..000000000
--- a/libraries/ARC2/parsers/ARC2_RSSParser.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RSS Parser
-author:   Benjamin Nowack
-version:  2008-02-10
-*/
-
-ARC2::inc('LegacyXMLParser');
-
-class ARC2_RSSParser extends ARC2_LegacyXMLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->triples = array();
-    $this->target_encoding = '';
-    $this->t_count = 0;
-    $this->added_triples = array();
-    $this->skip_dupes = false;
-    $this->bnode_prefix = $this->v('bnode_prefix', 'arc'.substr(md5(uniqid(rand())), 0, 4).'b', $this->a);
-    $this->bnode_id = 0;
-    $this->cache = array();
-    $this->allowCDataNodes = 0;
-  }
-  
-  /*  */
-  
-  function done() {
-    $this->extractRDF();
-  }
-  
-  /*  */
-  
-  function setReader(&$reader) {
-    $this->reader = $reader;
-  }
-  
-  function createBnodeID(){
-    $this->bnode_id++;
-    return '_:' . $this->bnode_prefix . $this->bnode_id;
-  }
-  
-  function addT($t) {
-    //if (!isset($t['o_datatype']))
-    if ($this->skip_dupes) {
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-
-  function countTriples() {
-    return $this->t_count;
-  }
-  
-  function getSimpleIndex($flatten_objects = 1, $vals = '') {
-    return ARC2::getSimpleIndex($this->getTriples(), $flatten_objects, $vals);
-  }
-
-  /*  */
-
-  function extractRDF() {
-    $index = $this->getNodeIndex();
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->rss = 'http://purl.org/rss/1.0/';
-    $this->dc = 'http://purl.org/dc/elements/1.1/';
-    $this->dct = 'http://purl.org/dc/terms/';
-    $this->content = 'http://purl.org/rss/1.0/modules/content/';
-    $this->enc = 'http://purl.oclc.org/net/rss_2.0/enc#';
-    $this->mappings = array(
-      'channel' => $this->rss . 'channel',
-      'item' => $this->rss . 'item',
-      'title' => $this->rss . 'title',
-      'link' => $this->rss . 'link',
-      'description' => $this->rss . 'description',
-      'guid' => $this->dc . 'identifier',
-      'author' => $this->dc . 'creator',
-      'category' => $this->dc . 'subject',
-      'pubDate' => $this->dc . 'date',
-      'pubdate' => $this->dc . 'date',
-      'source' => $this->dc . 'source',
-      'enclosure' => $this->enc . 'enclosure',
-    );
-    $this->dt_props = array(
-      $this->dc . 'identifier',
-      $this->rss . 'link'
-    );
-    foreach ($index as $p_id => $nodes) {
-      foreach ($nodes as $pos => $node) {
-        $tag = $this->v('tag', '', $node);
-        if ($tag == 'channel') {
-          $struct = $this->extractChannel($index[$node['id']]);
-          $triples = ARC2::getTriplesFromIndex($struct);
-          foreach ($triples as $t) {
-            $this->addT($t);
-          }
-        }
-        elseif ($tag == 'item') {
-          $struct = $this->extractItem($index[$node['id']]);
-          $triples = ARC2::getTriplesFromIndex($struct);
-          foreach ($triples as $t) {
-            $this->addT($t);
-          }
-        }
-      }
-    }
-  }
-  
-  function extractChannel($els) {
-    $res = array($this->rdf . 'type' => array(array('value' => $this->rss . 'channel', 'type' => 'uri')));
-    $res = array_merge($res, $this->extractProps($els, 'channel'));
-    return array($res[$this->rss . 'link'][0]['value'] => $res);
-  }
-  
-  function extractItem($els) {
-    $res = array($this->rdf . 'type' => array(array('value' => $this->rss . 'item', 'type' => 'uri')));
-    $res = array_merge($res, $this->extractProps($els, 'item'));
-    if (isset($res[$this->rss . 'link'])) return array($res[$this->rss . 'link'][0]['value'] => $res);
-    if (isset($res[$this->dc . 'identifier'])) return array($res[$this->dc . 'identifier'][0]['value'] => $res);
-  }
-  
-  function extractProps($els, $container) {
-    $res = array();
-    foreach ($els as $info) {
-      /* key */
-      $tag = $info['tag'];
-      if (!preg_match('/^[a-z0-9]+\:/i', $tag)) {
-        $k = isset($this->mappings[$tag]) ? $this->mappings[$tag] : '';
-      }
-      else {
-        $k = $tag;
-      }
-      if (($container == 'channel') && ($k == $this->rss . 'item')) continue;
-      /* val */
-      $v = $info['cdata'];
-      if (!$v) $v = $this->v('url', '', $info['a']);
-      if (!$v) $v = $this->v('href', '', $info['a']);
-      /* prop */
-      if ($k) {
-        /* enclosure handling */
-        if ($k == $this->enc . 'enclosure') {
-          $sub_res = array();
-          foreach (array('length', 'type') as $attr) {
-            if ($attr_v = $this->v($attr, 0, $info['a'])) {
-              $sub_res[$this->enc . $attr] = array(array('value' => $attr_v, 'type' => 'literal'));
-            }
-          }
-          $struct[$v] = $sub_res;
-        }
-        /* date handling */
-        if (in_array($k, array($this->dc . 'date', $this->dct . 'modified'))) {
-          if (!preg_match('/^[0-9]{4}/', $v) && ($sub_v = strtotime($v)) && ($sub_v != -1)) {
-            $tz = date('Z', $sub_v); /* timezone offset */
-            $sub_v -= $tz; /* utc */
-            $v = date('Y-m-d\TH:i:s\Z', $sub_v);
-          }
-        }
-        if (!isset($res[$k])) $res[$k] = array();
-        $res[$k][] = array('value' => $v, 'type' => in_array($k, $this->dt_props) || !preg_match('/^[a-z0-9]+\:[^\s]+$/is', $v) ? 'literal' : 'uri');
-      }
-    }
-    return $res;
-  }
-  
-  /*  */
-
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_SGAJSONParser.php b/libraries/ARC2/parsers/ARC2_SGAJSONParser.php
deleted file mode 100644
index 82ecc7ce9..000000000
--- a/libraries/ARC2/parsers/ARC2_SGAJSONParser.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 SG API JSON Parser
-author:   Benjamin Nowack
-version:  2008-07-17 (Tweak: Moved re-usable code to new ARC2_JSONParser)
-*/
-
-ARC2::inc('JSONParser');
-
-class ARC2_SGAJSONParser extends ARC2_JSONParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->nsp = array($this->rdf => 'rdf');
-  }
-  
-  /*  */
-
-  function done() {
-    $this->extractRDF();
-  }
-  
-  function extractRDF() {
-    $s = $this->getContext();
-    $os = $this->getURLs($this->struct);
-    foreach ($os as $o) {
-      if ($o != $s) $this->addT($s, 'http://www.w3.org/2000/01/rdf-schema#seeAlso', $o, 'uri', 'uri');
-    }
-  }
-  
-  function getContext() {
-    if (!isset($this->struct['canonical_mapping'])) return '';
-    foreach ($this->struct['canonical_mapping'] as $k => $v) return $v;
-  }
-  
-  function getURLs($struct) {
-    $r =array();
-    if (is_array($struct)) {
-      foreach ($struct as $k => $v) {
-        if (preg_match('/^http:\/\//', $k) && !in_array($k, $r)) $r[] = $k;
-        $sub_r = $this->getURLs($v);
-        foreach ($sub_r as $sub_v) {
-          if (!in_array($sub_v, $r)) $r[] = $sub_v;
-        }
-      }
-    }
-    elseif (preg_match('/^http:\/\//', $struct) && !in_array($struct, $r)) {
-      $r[] = $struct;
-    }
-    return $r;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/parsers/ARC2_SPARQLParser.php b/libraries/ARC2/parsers/ARC2_SPARQLParser.php
deleted file mode 100644
index 3483e2828..000000000
--- a/libraries/ARC2/parsers/ARC2_SPARQLParser.php
+++ /dev/null
@@ -1,777 +0,0 @@
-<?php
-/**
- * ARC2 SPARQL Parser
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-04-11
-*/
-
-ARC2::inc('TurtleParser');
-
-class ARC2_SPARQLParser extends ARC2_TurtleParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->bnode_prefix = $this->v('bnode_prefix', 'arc'.substr(md5(uniqid(rand())), 0, 4).'b', $this->a);
-    $this->bnode_id = 0;
-    $this->bnode_pattern_index = array('patterns' => array(), 'bnodes' => array());
-  }
-
-  /*  */
-
-  function parse($q, $src = '', $iso_fallback = 'ignore') {
-    $this->setDefaultPrefixes();
-    $this->base = $src ? $this->calcBase($src) : ARC2::getRequestURI();
-    $this->r = array(
-      'base' => '',
-      'vars' => array(),
-      'prefixes' => array()
-    );
-    $this->unparsed_code = $q;
-    list($r, $v) = $this->xQuery($q);
-    if ($r) {
-      $this->r['query'] = $r;
-      $this->unparsed_code = trim($v);
-    }
-    elseif (!$this->getErrors() && !$this->unparsed_code) {
-      $this->addError('Query not properly closed');
-    }
-    $this->r['prefixes'] = $this->prefixes;
-    $this->r['base'] = $this->base;
-    /* remove trailing comments */
-    while (preg_match('/^\s*(\#[^\xd\xa]*)(.*)$/si', $this->unparsed_code, $m)) $this->unparsed_code = $m[2];
-    if ($this->unparsed_code && !$this->getErrors()) {
-      $rest = preg_replace('/[\x0a|\x0d]/i', ' ', substr($this->unparsed_code, 0, 30));
-      $msg = trim($rest) ? 'Could not properly handle "' . $rest . '"' : 'Syntax error, probably an incomplete pattern';
-      $this->addError($msg);
-    }
-  }
-  
-  function getQueryInfos() {
-    return $this->v('r', array());
-  }
-
-  /* 1 */
-  
-  function xQuery($v) {
-    list($r, $v) = $this->xPrologue($v);
-    foreach (array('Select', 'Construct', 'Describe', 'Ask') as $type) {
-      $m = 'x' . $type . 'Query';
-      if ((list($r, $v) = $this->$m($v)) && $r) {
-        return array($r, $v);
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 2 */
-
-  function xPrologue($v) {
-    $r = 0;
-    if ((list($sub_r, $v) = $this->xBaseDecl($v)) && $sub_r) {
-      $this->base = $sub_r;
-      $r = 1;
-    }
-    while ((list($sub_r, $v) = $this->xPrefixDecl($v)) && $sub_r) {
-      $this->prefixes[$sub_r['prefix']] = $sub_r['uri'];
-      $r = 1;
-    }
-    return array($r, $v);
-  }
-
-  /* 5.. */
-  
-  function xSelectQuery($v) {
-    if ($sub_r = $this->x('SELECT\s+', $v)) {
-      $r = array(
-        'type' => 'select',
-        'result_vars' => array(),
-        'dataset' => array(),
-      );
-      $all_vars = 0;
-      $sub_v = $sub_r[1];
-      /* distinct, reduced */
-      if ($sub_r = $this->x('(DISTINCT|REDUCED)\s+', $sub_v)) {
-        $r[strtolower($sub_r[1])] = 1;
-        $sub_v = $sub_r[2];
-      }
-      /* result vars */
-      if ($sub_r = $this->x('\*\s+', $sub_v)) {
-        $all_vars = 1;
-        $sub_v = $sub_r[1];
-      }
-      else {
-        while ((list($sub_r, $sub_v) = $this->xResultVar($sub_v)) && $sub_r) {
-          $r['result_vars'][] = $sub_r;
-        }
-      }
-      if (!$all_vars && !count($r['result_vars'])) {
-        $this->addError('No result bindings specified.');
-      }
-      /* dataset */
-      while ((list($sub_r, $sub_v) = $this->xDatasetClause($sub_v)) && $sub_r) {
-        $r['dataset'][] = $sub_r;
-      }
-      /* where */
-      if ((list($sub_r, $sub_v) = $this->xWhereClause($sub_v)) && $sub_r) {
-        $r['pattern'] = $sub_r;
-      }
-      else {
-        return array(0, $v);
-      }
-      /* solution modifier */
-      if ((list($sub_r, $sub_v) = $this->xSolutionModifier($sub_v)) && $sub_r) {
-        $r = array_merge($r, $sub_r);
-      }
-      /* all vars */
-      if ($all_vars) {
-        foreach ($this->r['vars'] as $var) {
-          $r['result_vars'][] = array('var' => $var, 'aggregate' => 0, 'alias' => '');
-        }
-        if (!$r['result_vars']) {
-          $r['result_vars'][] = '*';
-        }
-      }
-      return array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  function xResultVar($v) {
-    return $this->xVar($v);
-  }
-
-  /* 6.. */
-  
-  function xConstructQuery($v) {
-    if ($sub_r = $this->x('CONSTRUCT\s*', $v)) {
-      $r = array(
-        'type' => 'construct',
-        'dataset' => array(),
-      );
-      $sub_v = $sub_r[1];
-      /* construct template */
-      if ((list($sub_r, $sub_v) = $this->xConstructTemplate($sub_v)) && is_array($sub_r)) {
-        $r['construct_triples'] = $sub_r;
-      }
-      else {
-        $this->addError('Construct Template not found');
-        return array(0, $v);
-      }
-      /* dataset */
-      while ((list($sub_r, $sub_v) = $this->xDatasetClause($sub_v)) && $sub_r) {
-        $r['dataset'][] = $sub_r;
-      }
-      /* where */
-      if ((list($sub_r, $sub_v) = $this->xWhereClause($sub_v)) && $sub_r) {
-        $r['pattern'] = $sub_r;
-      }
-      else {
-        return array(0, $v);
-      }
-      /* solution modifier */
-      if ((list($sub_r, $sub_v) = $this->xSolutionModifier($sub_v)) && $sub_r) {
-        $r = array_merge($r, $sub_r);
-      }
-      return array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-
-  /* 7.. */
-  
-  function xDescribeQuery($v) {
-    if ($sub_r = $this->x('DESCRIBE\s+', $v)) {
-      $r = array(
-        'type' => 'describe',
-        'result_vars' => array(),
-        'result_uris' => array(),
-        'dataset' => array(),
-      );
-      $sub_v = $sub_r[1];
-      $all_vars = 0;
-      /* result vars/uris */
-      if ($sub_r = $this->x('\*\s+', $sub_v)) {
-        $all_vars = 1;
-        $sub_v = $sub_r[1];
-      }
-      else {
-        do {
-          $proceed = 0;
-          if ((list($sub_r, $sub_v) = $this->xResultVar($sub_v)) && $sub_r) {
-            $r['result_vars'][] = $sub_r;
-            $proceed = 1;
-          }
-          if ((list($sub_r, $sub_v) = $this->xIRIref($sub_v)) && $sub_r) {
-            $r['result_uris'][] = $sub_r;
-            $proceed =1;
-          }
-        } while ($proceed);
-      }
-      if (!$all_vars && !count($r['result_vars']) && !count($r['result_uris'])) {
-        $this->addError('No result bindings specified.');
-      }
-      /* dataset */
-      while ((list($sub_r, $sub_v) = $this->xDatasetClause($sub_v)) && $sub_r) {
-        $r['dataset'][] = $sub_r;
-      }
-      /* where */
-      if ((list($sub_r, $sub_v) = $this->xWhereClause($sub_v)) && $sub_r) {
-        $r['pattern'] = $sub_r;
-      }
-      /* solution modifier */
-      if ((list($sub_r, $sub_v) = $this->xSolutionModifier($sub_v)) && $sub_r) {
-        $r = array_merge($r, $sub_r);
-      }
-      /* all vars */
-      if ($all_vars) {
-        foreach ($this->r['vars'] as $var) {
-          $r['result_vars'][] = array('var' => $var, 'aggregate' => 0, 'alias' => '');
-        }
-      }
-      return array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-
-  /* 8.. */
-  
-  function xAskQuery($v) {
-    if ($sub_r = $this->x('ASK\s+', $v)) {
-      $r = array(
-        'type' => 'ask',
-        'dataset' => array(),
-      );
-      $sub_v = $sub_r[1];
-      /* dataset */
-      while ((list($sub_r, $sub_v) = $this->xDatasetClause($sub_v)) && $sub_r) {
-        $r['dataset'][] = $sub_r;
-      }
-      /* where */
-      if ((list($sub_r, $sub_v) = $this->xWhereClause($sub_v)) && $sub_r) {
-        $r['pattern'] = $sub_r;
-        return array($r, $sub_v);
-      }
-      else {
-        $this->addError('Missing or invalid WHERE clause.');
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 9, 10, 11, 12 */
-
-  function xDatasetClause($v) {
-    if ($r = $this->x('FROM(\s+NAMED)?\s+', $v)) {
-      $named = $r[1] ? 1 : 0;
-      if ((list($r, $sub_v) = $this->xIRIref($r[2])) && $r) {
-        return array(array('graph' => $r, 'named' => $named), $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 13 */
-  
-  function xWhereClause($v) {
-    if ($r = $this->x('(WHERE)?', $v)) {
-      $v = $r[2];
-    }
-    if ((list($r, $v) = $this->xGroupGraphPattern($v)) && $r) {
-      return array($r, $v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 14, 15 */
-  
-  function xSolutionModifier($v) {
-    $r = array();
-    if ((list($sub_r, $sub_v) = $this->xOrderClause($v)) && $sub_r) {
-      $r['order_infos'] = $sub_r;
-    }
-    while ((list($sub_r, $sub_v) = $this->xLimitOrOffsetClause($sub_v)) && $sub_r) {
-      $r = array_merge($r, $sub_r);
-    }
-    return ($v == $sub_v) ? array(0, $v) : array($r, $sub_v);
-  }
-
-  /* 18, 19 */
-  
-  function xLimitOrOffsetClause($v) {
-    if ($sub_r = $this->x('(LIMIT|OFFSET)', $v)) {
-      $key = strtolower($sub_r[1]);
-      $sub_v = $sub_r[2];
-      if ((list($sub_r, $sub_v) = $this->xINTEGER($sub_v)) && ($sub_r !== false)) {
-        return array(array($key =>$sub_r), $sub_v);
-      }
-      if ((list($sub_r, $sub_v) = $this->xPlaceholder($sub_v)) && ($sub_r !== false)) {
-        return array(array($key =>$sub_r), $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 16 */
-  
-  function xOrderClause($v) {
-    if ($sub_r = $this->x('ORDER BY\s+', $v)) {
-      $sub_v = $sub_r[1];
-      $r = array();
-      while ((list($sub_r, $sub_v) = $this->xOrderCondition($sub_v)) && $sub_r) {
-        $r[] = $sub_r;
-      }
-      if (count($r)) {
-        return array($r, $sub_v);
-      }
-      else {
-        $this->addError('No order conditions specified.');
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 17, 27 */
-  
-  function xOrderCondition($v) {
-    if ($sub_r = $this->x('(ASC|DESC)', $v)) {
-      $dir = strtolower($sub_r[1]);
-      $sub_v = $sub_r[2];
-      if ((list($sub_r, $sub_v) = $this->xBrackettedExpression($sub_v)) && $sub_r) {
-        $sub_r['direction'] = $dir;
-        return array($sub_r, $sub_v);
-      }
-    }
-    elseif ((list($sub_r, $sub_v) = $this->xVar($v)) && $sub_r) {
-      $sub_r['direction'] = 'asc';
-      return array($sub_r, $sub_v);
-    }
-    elseif ((list($sub_r, $sub_v) = $this->xBrackettedExpression($v)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    elseif ((list($sub_r, $sub_v) = $this->xBuiltInCall($v)) && $sub_r) {
-      $sub_r['direction'] = 'asc';
-      return array($sub_r, $sub_v);
-    }
-    elseif ((list($sub_r, $sub_v) = $this->xFunctionCall($v)) && $sub_r) {
-      $sub_r['direction'] = 'asc';
-      return array($sub_r, $sub_v);
-    }
-    return array(0, $v);
-  }
-
-  /* 20 */
-  
-  function xGroupGraphPattern($v) {
-    $pattern_id = substr(md5(uniqid(rand())), 0, 4);
-    if ($sub_r = $this->x('\{', $v)) {
-      $r = array('type' => 'group', 'patterns' => array());
-      $sub_v = $sub_r[1];
-      if ((list($sub_r, $sub_v) = $this->xTriplesBlock($sub_v)) && $sub_r) {
-        $this->indexBnodes($sub_r, $pattern_id);
-        $r['patterns'][] = array('type' => 'triples', 'patterns' => $sub_r);
-      }
-      do {
-        $proceed = 0;
-        if ((list($sub_r, $sub_v) = $this->xGraphPatternNotTriples($sub_v)) && $sub_r) {
-          $r['patterns'][] = $sub_r;
-          $pattern_id = substr(md5(uniqid(rand())), 0, 4);
-          $proceed = 1;
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xFilter($sub_v)) && $sub_r) {
-          $r['patterns'][] = array('type' => 'filter', 'constraint' => $sub_r);
-          $proceed = 1;
-        }
-        if ($sub_r = $this->x('\.', $sub_v)) {
-          $sub_v = $sub_r[1];
-        }
-        if ((list($sub_r, $sub_v) = $this->xTriplesBlock($sub_v)) && $sub_r) {
-          $this->indexBnodes($sub_r, $pattern_id);
-          $r['patterns'][] = array('type' => 'triples', 'patterns' => $sub_r);
-          $proceed = 1;
-        }
-        if ((list($sub_r, $sub_v) = $this->xPlaceholder($sub_v)) && $sub_r) {
-          $r['patterns'][] = $sub_r;
-          $proceed = 1;
-        }
-      } while ($proceed);
-      if ($sub_r = $this->x('\}', $sub_v)) {
-        $sub_v = $sub_r[1];
-        return array($r, $sub_v);
-      }
-      $rest = preg_replace('/[\x0a|\x0d]/i', ' ', substr($sub_v, 0, 30));
-      $this->addError('Incomplete or invalid Group Graph pattern. Could not handle "' . $rest . '"');
-    }
-    return array(0, $v);
-  }
-  
-  function indexBnodes($triples, $pattern_id) {
-    $index_id = count($this->bnode_pattern_index['patterns']);
-    $index_id = $pattern_id;
-    $this->bnode_pattern_index['patterns'][] = $triples;
-    foreach ($triples as $t) {
-      foreach (array('s', 'p', 'o') as $term) {
-        if ($t[$term . '_type'] == 'bnode') {
-          $val = $t[$term];
-          if (isset($this->bnode_pattern_index['bnodes'][$val]) && ($this->bnode_pattern_index['bnodes'][$val] != $index_id)) {
-            $this->addError('Re-used bnode label "' .$val. '" across graph patterns');
-          }
-          else {
-            $this->bnode_pattern_index['bnodes'][$val] = $index_id;
-          }
-        }
-      }
-    }
-  }
-  
-  /* 22.., 25.. */
-  
-  function xGraphPatternNotTriples($v) {
-    if ((list($sub_r, $sub_v) = $this->xOptionalGraphPattern($v)) && $sub_r) {
-      return array($sub_r, $sub_v); 
-    }
-    if ((list($sub_r, $sub_v) = $this->xGraphGraphPattern($v)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    $r = array('type' => 'union', 'patterns' => array());
-    $sub_v = $v;
-    do {
-      $proceed = 0;
-      if ((list($sub_r, $sub_v) = $this->xGroupGraphPattern($sub_v)) && $sub_r) {
-        $r['patterns'][] = $sub_r;
-        if ($sub_r = $this->x('UNION', $sub_v)) {
-          $sub_v = $sub_r[1];
-          $proceed = 1;
-        }
-      }
-    } while ($proceed);
-    $pc = count($r['patterns']);
-    if ($pc == 1) {
-      return array($r['patterns'][0], $sub_v);
-    }
-    elseif ($pc > 1) {
-      return array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-
-  /* 23 */
-  
-  function xOptionalGraphPattern($v) {
-    if ($sub_r = $this->x('OPTIONAL', $v)) {
-      $sub_v = $sub_r[1];
-      if ((list($sub_r, $sub_v) = $this->xGroupGraphPattern($sub_v)) && $sub_r) {
-        return array(array('type' => 'optional', 'patterns' => $sub_r['patterns']), $sub_v);
-      }
-      $this->addError('Missing or invalid Group Graph Pattern after OPTIONAL');
-    }
-    return array(0, $v);
-  } 
-  
-  /* 24.. */
-  
-  function xGraphGraphPattern($v) {
-    if ($sub_r = $this->x('GRAPH', $v)) {
-      $sub_v = $sub_r[1];
-      $r = array('type' => 'graph', 'var' => '', 'uri' => '', 'patterns' => array());
-      if ((list($sub_r, $sub_v) = $this->xVar($sub_v)) && $sub_r) {
-        $r['var'] = $sub_r;
-      }
-      elseif ((list($sub_r, $sub_v) = $this->xIRIref($sub_v)) && $sub_r) {
-        $r['uri'] = $sub_r;
-      }
-      if ($r['var'] || $r['uri']) {
-        if ((list($sub_r, $sub_v) = $this->xGroupGraphPattern($sub_v)) && $sub_r) {
-          $r['patterns'][] = $sub_r;
-          return array($r, $sub_v);
-        }
-        $this->addError('Missing or invalid Graph Pattern');
-      }
-    }
-    return array(0, $v);
-  } 
-  
-  /* 26.., 27.. */
-  
-  function xFilter($v) {
-    if ($r = $this->x('FILTER', $v)) {
-      $sub_v = $r[1];
-      if ((list($r, $sub_v) = $this->xBrackettedExpression($sub_v)) && $r) {
-        return array($r, $sub_v);
-      }
-      if ((list($r, $sub_v) = $this->xBuiltInCall($sub_v)) && $r) {
-        return array($r, $sub_v);
-      }
-      if ((list($r, $sub_v) = $this->xFunctionCall($sub_v)) && $r) {
-        return array($r, $sub_v);
-      }
-      $this->addError('Incomplete FILTER');
-    }
-    return array(0, $v);
-  }
-  
-  /* 28.. */
-  
-  function xFunctionCall($v) {
-    if ((list($r, $sub_v) = $this->xIRIref($v)) && $r) {
-      if ((list($sub_r, $sub_v) = $this->xArgList($sub_v)) && $sub_r) {
-        return array(array('type' => 'function_call', 'uri' => $r, 'args' => $sub_r), $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 29 */
-  
-  function xArgList($v) {
-    $r = array();
-    $sub_v = $v;
-    $closed = 0;
-    if ($sub_r = $this->x('\(', $sub_v)) {
-      $sub_v = $sub_r[1];
-      do {
-        $proceed = 0;
-        if ((list($sub_r, $sub_v) = $this->xExpression($sub_v)) && $sub_r) {
-          $r[] = $sub_r;
-          if ($sub_r = $this->x('\,', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $proceed = 1;
-          }
-        }
-        if ($sub_r = $this->x('\)', $sub_v)) {
-         $sub_v = $sub_r[1];
-         $closed = 1;
-         $proceed = 0;
-        }
-      } while ($proceed);
-    }
-    return $closed ? array($r, $sub_v) : array(0, $v);
-  }
-  
-  /* 30, 31 */
-  
-  function xConstructTemplate($v) {
-    if ($sub_r = $this->x('\{', $v)) {
-      $r = array();
-      if ((list($sub_r, $sub_v) = $this->xTriplesBlock($sub_r[1])) && is_array($sub_r)) {
-        $r = $sub_r;
-      }
-      if ($sub_r = $this->x('\}', $sub_v)) {
-        return array($r, $sub_r[1]);
-      }
-    }
-    return array(0, $v);
-  }
-    
-  /* 46, 47 */
-  
-  function xExpression($v) {
-    if ((list($sub_r, $sub_v) = $this->xConditionalAndExpression($v)) && $sub_r) {
-      $r = array('type' => 'expression', 'sub_type' => 'or', 'patterns' => array($sub_r));
-      do {
-        $proceed = 0;
-        if ($sub_r = $this->x('\|\|', $sub_v)) {
-          $sub_v = $sub_r[1];
-          if ((list($sub_r, $sub_v) = $this->xConditionalAndExpression($sub_v)) && $sub_r) {
-            $r['patterns'][] = $sub_r;
-            $proceed = 1;
-          }
-        }
-      } while ($proceed);
-      return count($r['patterns']) == 1 ? array($r['patterns'][0], $sub_v) : array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 48.., 49.. */
-  
-  function xConditionalAndExpression($v) {
-    if ((list($sub_r, $sub_v) = $this->xRelationalExpression($v)) && $sub_r) {
-      $r = array('type' => 'expression', 'sub_type' => 'and', 'patterns' => array($sub_r));
-      do {
-        $proceed = 0;
-        if ($sub_r = $this->x('\&\&', $sub_v)) {
-          $sub_v = $sub_r[1];
-          if ((list($sub_r, $sub_v) = $this->xRelationalExpression($sub_v)) && $sub_r) {
-            $r['patterns'][] = $sub_r;
-            $proceed = 1;
-          }
-        }
-      } while ($proceed);
-      return count($r['patterns']) == 1 ? array($r['patterns'][0], $sub_v) : array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 50, 51 */
-
-  function xRelationalExpression($v) {
-    if ((list($sub_r, $sub_v) = $this->xAdditiveExpression($v)) && $sub_r) {
-      $r = array('type' => 'expression', 'sub_type' => 'relational', 'patterns' => array($sub_r));
-      do {
-        $proceed = 0;
-        /* don't mistake '<' + uriref with '<'-operator ("longest token" rule) */
-        if ((list($sub_r, $sub_v) = $this->xIRI_REF($sub_v)) && $sub_r) {
-          $this->addError('Expected operator, found IRIref: "'.$sub_r.'".');
-        }
-        if ($sub_r = $this->x('(\!\=|\=\=|\=|\<\=|\>\=|\<|\>)', $sub_v)) {
-          $op = $sub_r[1];
-          $sub_v = $sub_r[2];
-          $r['operator'] = $op;
-          if ((list($sub_r, $sub_v) = $this->xAdditiveExpression($sub_v)) && $sub_r) {
-            //$sub_r['operator'] = $op;
-            $r['patterns'][] = $sub_r;
-            $proceed = 1;
-          }
-        }
-      } while ($proceed);
-      return count($r['patterns']) == 1 ? array($r['patterns'][0], $sub_v) : array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 52 */
-  
-  function xAdditiveExpression($v) {
-    if ((list($sub_r, $sub_v) = $this->xMultiplicativeExpression($v)) && $sub_r) {
-      $r = array('type' => 'expression', 'sub_type' => 'additive', 'patterns' => array($sub_r));
-      do {
-        $proceed = 0;
-        if ($sub_r = $this->x('(\+|\-)', $sub_v)) {
-          $op = $sub_r[1];
-          $sub_v = $sub_r[2];
-          if ((list($sub_r, $sub_v) = $this->xMultiplicativeExpression($sub_v)) && $sub_r) {
-            $sub_r['operator'] = $op;
-            $r['patterns'][] = $sub_r;
-            $proceed = 1;
-          }
-          elseif ((list($sub_r, $sub_v) = $this->xNumericLiteral($sub_v)) && $sub_r) {
-            $r['patterns'][] = array('type' => 'numeric', 'operator' => $op, 'value' => $sub_r);
-            $proceed = 1;
-          }
-        }
-      } while ($proceed);
-      //return array($r, $sub_v);
-      return count($r['patterns']) == 1 ? array($r['patterns'][0], $sub_v) : array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 53 */
-  
-  function xMultiplicativeExpression($v) {
-    if ((list($sub_r, $sub_v) = $this->xUnaryExpression($v)) && $sub_r) {
-      $r = array('type' => 'expression', 'sub_type' => 'multiplicative', 'patterns' => array($sub_r));
-      do {
-        $proceed = 0;
-        if ($sub_r = $this->x('(\*|\/)', $sub_v)) {
-          $op = $sub_r[1];
-          $sub_v = $sub_r[2];
-          if ((list($sub_r, $sub_v) = $this->xUnaryExpression($sub_v)) && $sub_r) {
-            $sub_r['operator'] = $op;
-            $r['patterns'][] = $sub_r;
-            $proceed = 1;
-          }
-        }
-      } while ($proceed);
-      return count($r['patterns']) == 1 ? array($r['patterns'][0], $sub_v) : array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 54 */
-  
-  function xUnaryExpression($v) {
-    $sub_v = $v;
-    $op = '';
-    if ($sub_r = $this->x('(\!|\+|\-)', $sub_v)) {
-      $op = $sub_r[1];
-      $sub_v = $sub_r[2];
-    }
-    if ((list($sub_r, $sub_v) = $this->xPrimaryExpression($sub_v)) && $sub_r) {
-      if (!is_array($sub_r)) {
-        $sub_r = array('type' => 'unary', 'expression' => $sub_r);
-      }
-      elseif ($sub_op = $this->v1('operator', '', $sub_r)) {
-        $ops = array('!!' => '', '++' => '+', '--' => '+', '+-' => '-', '-+' => '-');
-        $op = isset($ops[$op . $sub_op]) ? $ops[$op . $sub_op] : $op . $sub_op;
-      }
-      $sub_r['operator'] = $op;
-      return array($sub_r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 55 */
-  
-  function xPrimaryExpression($v) {
-    foreach (array('BrackettedExpression', 'BuiltInCall', 'IRIrefOrFunction', 'RDFLiteral', 'NumericLiteral', 'BooleanLiteral', 'Var', 'Placeholder') as $type) {
-      $m = 'x' . $type;
-      if ((list($sub_r, $sub_v) = $this->$m($v)) && $sub_r) {
-        return array($sub_r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 56 */
-  
-  function xBrackettedExpression($v) {
-    if ($r = $this->x('\(', $v)) {
-      if ((list($r, $sub_v) = $this->xExpression($r[1])) && $r) {
-        if ($sub_r = $this->x('\)', $sub_v)) {
-          return array($r, $sub_r[1]);
-        }
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 57.., 58.. */
-  
-  function xBuiltInCall($v) {
-    if ($sub_r = $this->x('(str|lang|langmatches|datatype|bound|sameterm|isiri|isuri|isblank|isliteral|regex)\s*\(', $v)) {
-      $r = array('type' => 'built_in_call', 'call' => strtolower($sub_r[1]));
-      if ((list($sub_r, $sub_v) = $this->xArgList('(' . $sub_r[2])) && is_array($sub_r)) {
-        $r['args'] = $sub_r;
-        return array($r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 59.. */
-  
-  function xIRIrefOrFunction($v) {
-    if ((list($r, $v) = $this->xIRIref($v)) && $r) {
-      if ((list($sub_r, $sub_v) = $this->xArgList($v)) && is_array($sub_r)) {
-        return array(array('type' => 'function', 'uri' => $r, 'args' => $sub_r), $sub_v);
-      }
-      return array(array('type' => 'uri', 'uri' => $r), $sub_v);
-    }
-  }
-
-  /* 70.. @@sync with TurtleParser */
-  
-  function xIRI_REF($v) {
-    if (($r = $this->x('\<(\$\{[^\>]*\})\>', $v)) && ($sub_r = $this->xPlaceholder($r[1]))) {
-      return array($r[1], $r[2]);
-    }
-    elseif ($r = $this->x('\<([^\<\>\s\"\|\^`]*)\>', $v)) {
-      return array($r[1] ? $r[1] : true, $r[2]);
-    }
-    /* allow reserved chars in obvious IRIs */
-    elseif ($r = $this->x('\<(https?\:[^\s][^\<\>]*)\>', $v)) {
-      return array($r[1] ? $r[1] : true, $r[2]);
-    }
-    return array(0, $v);
-  }
-    
-}  
diff --git a/libraries/ARC2/parsers/ARC2_SPARQLPlusParser.php b/libraries/ARC2/parsers/ARC2_SPARQLPlusParser.php
deleted file mode 100644
index 91927d4a0..000000000
--- a/libraries/ARC2/parsers/ARC2_SPARQLPlusParser.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 SPARQL+ Parser (SPARQL + Aggregates + LOAD + INSERT + DELETE)
-author:   Benjamin Nowack
-version:  2008-05-30 (Tweak: CONSTRUCT keyword is now optional)
-*/
-
-ARC2::inc('SPARQLParser');
-
-class ARC2_SPARQLPlusParser extends ARC2_SPARQLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /* +1 */
-  
-  function xQuery($v) {
-    list($r, $v) = $this->xPrologue($v);
-    foreach (array('Select', 'Construct', 'Describe', 'Ask', 'Insert', 'Delete', 'Load') as $type) {
-      $m = 'x' . $type . 'Query';
-      if ((list($r, $v) = $this->$m($v)) && $r) {
-        return array($r, $v);
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* +3 */
-  
-  function xResultVar($v) {
-    $aggregate = '';
-    /* aggregate */
-    if ($sub_r = $this->x('\(?(AVG|COUNT|MAX|MIN|SUM)\s*\(\s*([^\)]+)\)\s+AS\s+([^\s\)]+)\)?', $v)) {
-      $aggregate = $sub_r[1];
-      $result_var = $sub_r[3];
-      $v = $sub_r[2] . $sub_r[4];
-    }
-    if ($sub_r && (list($sub_r, $sub_v) = $this->xVar($result_var)) && $sub_r) {
-      $result_var = $sub_r['value'];
-    }
-    /* * or var */
-    if ((list($sub_r, $sub_v) = $this->x('\*', $v)) && $sub_r) {
-      return array(array('var' => $sub_r['value'], 'aggregate' => $aggregate, 'alias' => $aggregate ? $result_var : ''), $sub_v);
-    }
-    if ((list($sub_r, $sub_v) = $this->xVar($v)) && $sub_r) {
-      return array(array('var' => $sub_r['value'], 'aggregate' => $aggregate, 'alias' => $aggregate ? $result_var : ''), $sub_v);
-    }
-    return array(0, $v);
-  }
-
-  /* +4 */
- 
-  function xLoadQuery($v) {
-    if ($sub_r = $this->x('LOAD\s+', $v)) {
-      $sub_v = $sub_r[1];
-      if ((list($sub_r, $sub_v) = $this->xIRIref($sub_v)) && $sub_r) {
-        $r = array('type' => 'load', 'url' => $sub_r, 'target_graph' => '');
-        if ($sub_r = $this->x('INTO\s+', $sub_v)) {
-          $sub_v = $sub_r[1];
-          if ((list($sub_r, $sub_v) = $this->xIRIref($sub_v)) && $sub_r) {
-            $r['target_graph'] = $sub_r;
-          }
-        }
-        return array($r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* +5 */
-  
-  function xInsertQuery($v) {
-    if ($sub_r = $this->x('INSERT\s+', $v)) {
-      $r = array(
-        'type' => 'insert',
-        'dataset' => array(),
-      );
-      $sub_v = $sub_r[1];
-      /* target */
-      if ($sub_r = $this->x('INTO\s+', $sub_v)) {
-        $sub_v = $sub_r[1];
-        if ((list($sub_r, $sub_v) = $this->xIRIref($sub_v)) && $sub_r) {
-          $r['target_graph'] = $sub_r;
-          /* CONSTRUCT keyword, optional */
-          if ($sub_r = $this->x('CONSTRUCT\s+', $sub_v)) {
-            $sub_v = $sub_r[1];
-          }
-          /* construct template */
-          if ((list($sub_r, $sub_v) = $this->xConstructTemplate($sub_v)) && is_array($sub_r)) {
-            $r['construct_triples'] = $sub_r;
-          }
-          else {
-            $this->addError('Construct Template not found');
-            return array(0, $v);
-          }
-          /* dataset */
-          while ((list($sub_r, $sub_v) = $this->xDatasetClause($sub_v)) && $sub_r) {
-            $r['dataset'][] = $sub_r;
-          }
-          /* where */
-          if ((list($sub_r, $sub_v) = $this->xWhereClause($sub_v)) && $sub_r) {
-            $r['pattern'] = $sub_r;
-          }
-          /* solution modifier */
-          if ((list($sub_r, $sub_v) = $this->xSolutionModifier($sub_v)) && $sub_r) {
-            $r = array_merge($r, $sub_r);
-          }
-          return array($r, $sub_v);
-        }
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* +6 */
-  
-  function xDeleteQuery($v) {
-    if ($sub_r = $this->x('DELETE\s+', $v)) {
-      $r = array(
-        'type' => 'delete',
-        'target_graphs' => array()
-      );
-      $sub_v = $sub_r[1];
-      /* target */
-      do {
-        $proceed = false;
-        if ($sub_r = $this->x('FROM\s+', $sub_v)) {
-          $sub_v = $sub_r[1];
-          if ((list($sub_r, $sub_v) = $this->xIRIref($sub_v)) && $sub_r) {
-            $r['target_graphs'][] = $sub_r;
-            $proceed = 1;
-          }
-        }
-      } while ($proceed);
-      /* CONSTRUCT keyword, optional */
-      if ($sub_r = $this->x('CONSTRUCT\s+', $sub_v)) {
-        $sub_v = $sub_r[1];
-      }
-      /* construct template */
-      if ((list($sub_r, $sub_v) = $this->xConstructTemplate($sub_v)) && is_array($sub_r)) {
-        $r['construct_triples'] = $sub_r;
-        /* dataset */
-        while ((list($sub_r, $sub_v) = $this->xDatasetClause($sub_v)) && $sub_r) {
-          $r['dataset'][] = $sub_r;
-        }
-        /* where */
-        if ((list($sub_r, $sub_v) = $this->xWhereClause($sub_v)) && $sub_r) {
-          $r['pattern'] = $sub_r;
-        }
-        /* solution modifier */
-        if ((list($sub_r, $sub_v) = $this->xSolutionModifier($sub_v)) && $sub_r) {
-          $r = array_merge($r, $sub_r);
-        }
-      }
-      return array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* +7 */
-  
-  function xSolutionModifier($v) {
-    $r = array();
-    if ((list($sub_r, $sub_v) = $this->xGroupClause($v)) && $sub_r) {
-      $r['group_infos'] = $sub_r;
-    }
-    if ((list($sub_r, $sub_v) = $this->xOrderClause($sub_v)) && $sub_r) {
-      $r['order_infos'] = $sub_r;
-    }
-    while ((list($sub_r, $sub_v) = $this->xLimitOrOffsetClause($sub_v)) && $sub_r) {
-      $r = array_merge($r, $sub_r);
-    }
-    return ($v == $sub_v) ? array(0, $v) : array($r, $sub_v);
-  }
-
-  /* +8 */
-
-  function xGroupClause($v) {
-    if ($sub_r = $this->x('GROUP BY\s+', $v)) {
-      $sub_v = $sub_r[1];
-      $r = array();
-      do {
-        $proceed = 0;
-        if ((list($sub_r, $sub_v) = $this->xVar($sub_v)) && $sub_r) {
-          $r[] = $sub_r;
-          $proceed = 1;
-          if ($sub_r = $this->x('\,', $sub_v)) {
-            $sub_v = $sub_r[1];
-          }
-        }
-      } while ($proceed);
-      if (count($r)) {
-        return array($r, $sub_v);
-      }
-      else {
-        $this->addError('No columns specified in GROUP BY clause.');
-      }
-    }
-    return array(0, $v);
-  }
-
-}  
diff --git a/libraries/ARC2/parsers/ARC2_SPARQLXMLResultParser.php b/libraries/ARC2/parsers/ARC2_SPARQLXMLResultParser.php
deleted file mode 100644
index 9a07bb935..000000000
--- a/libraries/ARC2/parsers/ARC2_SPARQLXMLResultParser.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 SPARQL Result XML Parser
-author:   Benjamin Nowack
-version:  2008-08-28 (Addition: Support for "inserted" and "deleted")
-*/
-
-ARC2::inc('LegacyXMLParser');
-
-class ARC2_SPARQLXMLResultParser extends ARC2_LegacyXMLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->srx = 'http://www.w3.org/2005/sparql-results#';
-    $this->nsp[$this->srx] = 'srx';
-    $this->allowCDataNodes = 0;
-  }
-  
-  /*  */
-  
-  function done() {
-  }
-  
-  /*  */
-  
-  function getVariables() {
-    $r = array();
-    foreach ($this->nodes as $node) {
-      if ($node['tag'] == $this->srx . 'variable') {
-        $r[] = $node['a']['name'];
-      }
-    }
-    return $r;
-  }
-  
-  function getRows() {
-    $r = array();
-    $index = $this->getNodeIndex();
-    foreach ($this->nodes as $node) {
-      if ($node['tag'] == $this->srx . 'result') {
-        $row = array();
-        $row_id = $node['id'];
-        $bindings = isset($index[$row_id])? $index[$row_id] : array();
-        foreach ($bindings as $binding) {
-          $row = array_merge($row, $this->getBinding($binding));
-        }
-        if ($row) {
-          $r[] = $row;
-        }
-      }
-    }
-    return $r;
-  }
-
-  function getBinding($node) {
-    $r = array();
-    $index = $this->getNodeIndex();
-    $var = $node['a']['name'];
-    $term = $index[$node['id']][0];
-    $r[$var . ' type'] = preg_replace('/^uri$/', 'uri', substr($term['tag'], strlen($this->srx)));
-    $r[$var] = ($r[$var . ' type'] == 'bnode') ? '_:' . $term['cdata'] : $term['cdata'];
-    if (isset($term['a']['datatype'])) {
-      $r[$var . ' datatype'] = $term['a']['datatype'];
-    }
-    elseif (isset($term['a'][$this->xml . 'lang'])) {
-      $r[$var . ' lang'] = $term['a'][$this->xml . 'lang'];
-    }
-    return $r;
-  }
-
-  function getBooleanInsertedDeleted() {
-    foreach ($this->nodes as $node) {
-      if ($node['tag'] == $this->srx . 'boolean') {
-        return ($node['cdata'] == 'true') ? array('boolean' => true) : array('boolean' => false);
-      }
-      elseif ($node['tag'] == $this->srx . 'inserted') {
-        return array('inserted' => $node['cdata']);
-      }
-      elseif ($node['tag'] == $this->srx . 'deleted') {
-        return array('deleted' => $node['cdata']);
-      }
-      elseif ($node['tag'] == $this->srx . 'results') {
-        return '';
-      }
-    }
-    return '';
-  }
-
-  /*  */
-  
-  function getStructure() {
-    $r = array('variables' => $this->getVariables(), 'rows' => $this->getRows());
-    /* boolean|inserted|deleted */
-    if ($sub_r = $this->getBooleanInsertedDeleted()) {
-      foreach ($sub_r as $k => $v) {
-        $r[$k] = $v;
-      }
-    }
-    return $r;
-  }
-
-  /*  */
-
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_SPOGParser.php b/libraries/ARC2/parsers/ARC2_SPOGParser.php
deleted file mode 100644
index e1665d67e..000000000
--- a/libraries/ARC2/parsers/ARC2_SPOGParser.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * ARC2 streaming SPOG parser
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-08
-*/
-
-ARC2::inc('RDFParser');
-
-class ARC2_SPOGParser extends ARC2_RDFParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->encoding = $this->v('encoding', false, $this->a);
-    $this->xml = 'http://www.w3.org/XML/1998/namespace';
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->nsp = array($this->xml => 'xml', $this->rdf => 'rdf');
-    $this->target_encoding = '';
-  }
-  
-  /*  */
-
-  function parse($path, $data = '', $iso_fallback = false) {
-    $this->state = 0;
-    /* reader */
-    if (!$this->v('reader')) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->setAcceptHeader('Accept: sparql-results+xml; q=0.9, */*; q=0.1');
-    $this->reader->activate($path, $data);
-    $this->x_base = isset($this->a['base']) && $this->a['base'] ? $this->a['base'] : $this->reader->base;
-    /* xml parser */
-    $this->initXMLParser();
-    /* parse */
-    $first = true;
-    while ($d = $this->reader->readStream()) {
-      if ($iso_fallback && $first) {
-        $d = '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . preg_replace('/^\<\?xml [^\>]+\?\>\s*/s', '', $d);
-        $first = false;
-      }
-      if (!xml_parse($this->xml_parser, $d, false)) {
-        $error_str = xml_error_string(xml_get_error_code($this->xml_parser));
-        $line = xml_get_current_line_number($this->xml_parser);
-        $this->tmp_error = 'XML error: "' . $error_str . '" at line ' . $line . ' (parsing as ' . $this->getEncoding() . ')';
-        $this->tmp_error .= $d . urlencode($d);
-        if (0 && !$iso_fallback && preg_match("/Invalid character/i", $error_str)) {
-          xml_parser_free($this->xml_parser);
-          unset($this->xml_parser);
-          $this->reader->closeStream();
-          $this->__init();
-          $this->encoding = 'ISO-8859-1';
-          unset($this->xml_parser);
-          unset($this->reader);
-          return $this->parse($path, $data, true);
-        }
-        else {
-          return $this->addError($this->tmp_error);
-        }
-      }
-    }
-    $this->target_encoding = xml_parser_get_option($this->xml_parser, XML_OPTION_TARGET_ENCODING);
-    xml_parser_free($this->xml_parser);
-    $this->reader->closeStream();
-    unset($this->reader);
-    return $this->done();
-  }
-  
-  /*  */
-  
-  function initXMLParser() {
-    if (!isset($this->xml_parser)) {
-      $enc = preg_match('/^(utf\-8|iso\-8859\-1|us\-ascii)$/i', $this->getEncoding(), $m) ? $m[1] : 'UTF-8';
-      $parser = xml_parser_create($enc);
-      xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
-      xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-      xml_set_element_handler($parser, 'open', 'close');
-      xml_set_character_data_handler($parser, 'cdata');
-      xml_set_start_namespace_decl_handler($parser, 'nsDecl');
-      xml_set_object($parser, $this);
-      $this->xml_parser = $parser;
-    }
-  }
-
-  /*  */
-  
-  function getEncoding($src = 'config') {
-    if ($src == 'parser') {
-      return $this->target_encoding;
-    }
-    elseif (($src == 'config') && $this->encoding) {
-      return $this->encoding;
-    }
-    return $this->reader->getEncoding();
-    return 'UTF-8';
-  }
-  
-  /*  */
-  
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-  
-  function countTriples() {
-    return $this->t_count;
-  }
-
-  function addT($s = '', $p = '', $o = '', $s_type = '', $o_type = '', $o_dt = '', $o_lang = '', $g = '') {
-    if (!($s && $p && $o)) return 0;
-    //echo "-----\nadding $s / $p / $o\n-----\n";
-    $t = array('s' => $s, 'p' => $p, 'o' => $o, 's_type' => $s_type, 'o_type' => $o_type, 'o_datatype' => $o_dt, 'o_lang' => $o_lang, 'g' => $g);
-    if ($this->skip_dupes) {
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  /*  */
-  
-  function open($p, $t, $a) {
-    $this->state = $t;
-    if ($t == 'result') {
-      $this->t = array();
-    }
-    elseif ($t == 'binding') {
-      $this->binding = $a['name'];
-      $this->t[$this->binding] = '';
-    }
-    elseif ($t == 'literal') {
-      $this->t[$this->binding . '_dt'] = $this->v('datatype', '', $a);
-      $this->t[$this->binding . '_lang'] = $this->v('xml:lang', '', $a);
-      $this->t[$this->binding . '_type'] = 'literal';
-    }
-    elseif ($t == 'uri') {
-      $this->t[$this->binding . '_type'] = 'uri';
-    }
-    elseif ($t == 'bnode') {
-      $this->t[$this->binding . '_type'] = 'bnode';
-      $this->t[$this->binding] = '_:';
-    }
-  }
-  
-  function close($p, $t) {
-    $this->prev_state = $this->state;
-    $this->state = '';
-    if ($t == 'result') {
-      $this->addT(
-        $this->v('s', '', $this->t), 
-        $this->v('p', '', $this->t), 
-        $this->v('o', '', $this->t), 
-        $this->v('s_type', '', $this->t), 
-        $this->v('o_type', '', $this->t), 
-        $this->v('o_dt', '', $this->t), 
-        $this->v('o_lang', '', $this->t), 
-        $this->v('g', '', $this->t)
-      );
-    }
-  }
-
-  function cData($p, $d) {
-    if (in_array($this->state, array('uri', 'bnode', 'literal'))) {
-      $this->t[$this->binding] .= $d;
-    }
-  }
-  
-  function nsDecl($p, $prf, $uri) {
-    $this->nsp[$uri] = isset($this->nsp[$uri]) ? $this->nsp[$uri] : $prf;
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/parsers/ARC2_SemHTMLParser.php b/libraries/ARC2/parsers/ARC2_SemHTMLParser.php
deleted file mode 100644
index c28ac1b59..000000000
--- a/libraries/ARC2/parsers/ARC2_SemHTMLParser.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDF/XML Parser
-author:   Benjamin Nowack
-version:  2009-02-09 (Addition: Support for RDFa detection via typeof/property/about)
-*/
-
-ARC2::inc('LegacyXMLParser');
-
-class ARC2_SemHTMLParser extends ARC2_LegacyXMLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->default_sem_html_formats = 'dc openid erdf rdfa posh-rdf microformats';
-    $this->triples = array();
-    $this->target_encoding = '';
-    $this->t_count = 0;
-    $this->added_triples = array();
-    $this->skip_dupes = false;
-    $this->bnode_prefix = $this->v('bnode_prefix', 'arc'.substr(md5(uniqid(rand())), 0, 4).'b', $this->a);
-    $this->bnode_id = 0;
-    $this->auto_extract = $this->v('auto_extract', 1, $this->a);
-    $this->extracted_formats = array();
-    $this->cache = array();
-    $this->detected_formats = array();
-    $this->keep_cdata_ws = $this->v('keep_cdata_whitespace', 0, $this->a);
-  }
-  
-  /*  */
-
-  function x($re, $v, $options = 'si', $keep_ws = 0) {
-    list($ws, $v) = preg_match('/^(\s*)(.*)$/s', $v, $m) ? array($m[1], $m[2]) : array('', $v);
-    if (preg_match("/^" . $re . "(.*)$/" . $options, $v, $m)) {
-      if ($keep_ws) $m[1] = $ws . $m[1];
-      return $m;
-    }
-    return false;
-  }
-
-  /*  */
-
-  function setReader(&$reader) {
-    $this->reader = $reader;
-  }
-  
-  function createBnodeID(){
-    $this->bnode_id++;
-    return '_:' . $this->bnode_prefix . $this->bnode_id;
-  }
-  
-  function addT($t) {
-    if (function_exists('html_entity_decode')) {
-      $t['o'] = html_entity_decode($t['o']);
-    }
-    if ($this->skip_dupes) {
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-
-  function countTriples() {
-    return $this->t_count;
-  }
-  
-  function getSimpleIndex($flatten_objects = 1, $vals = '') {
-    return ARC2::getSimpleIndex($this->getTriples(), $flatten_objects, $vals);
-  }
-
-  /*  */
-
-  function parse($path, $data = '', $iso_fallback = 'ignore') {
-    $this->nodes = array();
-    $this->node_count = 0;
-    $this->level = 0;
-    /* reader */
-    if (!$this->v('reader')) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->setAcceptHeader('Accept: text/html, application/xhtml, */*; q=0.9');
-    $this->reader->activate($path, $data);
-    $this->target_encoding = $this->reader->getEncoding(false);
-    $this->x_base = isset($this->a['base']) && $this->a['base'] ? $this->a['base'] : $this->reader->base;
-    $this->base = $this->x_base;
-    $this->doc_url = $this->reader->base;
-    /* parse */
-    $rest = '';
-    $this->cur_tag = '';
-    while ($d = $this->reader->readStream(1)) {
-      $rest = $this->processData($rest . $d);
-    }
-    $this->reader->closeStream();
-    unset($this->reader);
-    return $this->done();
-  }
-  
-  /*  */
-
-  function getEncoding($src = 'ignore') {
-    return $this->target_encoding;
-  }
-
-  /*  */
-  
-  function done() {
-    if ($this->auto_extract) {
-      $this->extractRDF();
-    }
-  }
-  
-  /*  */
-
-  function processData($v) {
-    $sub_v = $v;
-    do {
-      $proceed = 1;
-      if ((list($sub_r, $sub_v) = $this->xComment($sub_v)) && $sub_r) {
-        $this->open(0, 'comment', array('value' => $sub_r));
-        $this->close(0, 'comment');
-        continue;
-      }
-      if ((list($sub_r, $sub_v) = $this->xDoctype($sub_v)) && $sub_r) {
-        $this->open(0, 'doctype', array('value' => $sub_r));
-        $this->close(0, 'doctype');
-        /* RDFa detection */
-        if (preg_match('/rdfa /i', $sub_r)) $this->detected_formats['rdfa'] = 1;
-        continue;
-      }
-      if ($this->level && ((list($sub_r, $sub_v) = $this->xWS($sub_v)) && $sub_r)) {
-        $this->cData(0, $sub_r);
-      }
-      elseif ((list($sub_r, $sub_v) = $this->xOpen($sub_v)) && $sub_r) {
-        $this->open(0, $sub_r['tag'], $sub_r['a']);
-        $this->cur_tag = $sub_r['tag'];
-        if ($sub_r['empty']) {
-          $this->close(0, $sub_r['tag'], 1);
-          $this->cur_tag = '';
-        }
-        /* eRDF detection */
-        if (!isset($this->detected_formats['erdf']) && isset($sub_r['a']['profile m']) && in_array('http://purl.org/NET/erdf/profile', $sub_r['a']['profile m'])) $this->detected_formats['erdf'] = 1;
-        /* poshRDF detection */
-        if (!isset($this->detected_formats['posh-rdf']) && isset($sub_r['a']['class m']) && in_array('rdf-p', $sub_r['a']['class m'])) $this->detected_formats['posh-rdf'] = 1;
-        /* RDFa detection */
-        if (!isset($this->detected_formats['rdfa']) && ($this->cur_tag == 'html') && isset($sub_r['a']['version m']) && in_array('XHTML+RDFa', $sub_r['a']['version m'])) $this->detected_formats['rdfa'] = 1;
-        if (!isset($this->detected_formats['rdfa']) && isset($sub_r['a']['xmlns']) && $sub_r['a']['xmlns'] && $this->isRDFNSDecl($sub_r['a']['xmlns'])) $this->detected_formats['rdfa'] = 1;
-        if (!isset($this->detected_formats['rdfa']) && array_intersect(array('about', 'typeof', 'property'), array_keys($sub_r['a']))) $this->detected_formats['rdfa'] = 1;
-      }
-      elseif ((list($sub_r, $sub_v) = $this->xClose($sub_v)) && $sub_r) {
-        if (preg_match('/^(area|base|br|col|frame|hr|input|img|link|xmeta|param)$/', $sub_r['tag'])) {
-          /* already implicitly closed */
-        }
-        else {
-          $this->close(0, $sub_r['tag']);
-          $this->cur_tag = '';
-        }
-      }
-      elseif ((list($sub_r, $sub_v) = $this->xCData($sub_v)) && $sub_r) {
-        $this->cData(0, $sub_r);
-      }
-      else {
-        $proceed = 0;
-      }
-    } while ($proceed);
-    return $sub_v;
-  }
-
-  /*  */
-
-  function isRDFNSDecl($ns) {
-    foreach ($ns as $k => $v) {
-      if ($k) return 1;
-    }
-    return 0;
-  }
-
-  /*  */
-
-  function xComment($v) {
-    if ($r = $this->x('\<\!\-\-', $v)) {
-      if ($sub_r = $this->x('(.*)\-\-\>', $r[1], 'Us')) {
-        return array($sub_r[1], $sub_r[2]);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  function xDoctype($v) {
-    if ($r = $this->x('\<\!DOCTYPE', $v)) {
-      if ($sub_r = $this->x('([^\>]+)\>', $r[1])) {
-        return array($sub_r[1], $sub_r[2]);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  function xWS($v) {
-    if ($r = ARC2::x('(\s+)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(0, $v);
-  }
-  
-  /*  */
-
-  function xOpen($v) {
-    if ($r = $this->x('\<([^\s\/\>]+)([^\>]*)\>', $v)) {
-      list($sub_r, $sub_v) = $this->xAttributes($r[2]);
-      return array(array('tag' => strtolower($r[1]), 'a' => $sub_r, 'empty' => $this->isEmpty($r[1], $r[2])), $r[3]);
-    }
-    return array(0, $v);
-  }
-  
-  /*  */
-
-  function xAttributes($v) {
-    $r = array();
-    while ((list($sub_r, $v) = $this->xAttribute($v)) && $sub_r) {
-      if ($sub_sub_r = $this->x('xmlns\:?(.*)', $sub_r['k'])) {
-        $this->nsDecl(0, $sub_sub_r[1], $sub_r['value']);
-        $r['xmlns'][$sub_sub_r[1]] = $sub_r['value'];
-      }
-      else {
-        $r[$sub_r['k']] = $sub_r['value'];
-        $r[$sub_r['k'] . ' m'] = $sub_r['values'];
-      }
-    }
-    return array($r, $v);
-  }
-
-  /*  */
-
-  function xAttribute($v) {
-    if ($r = $this->x('([^\s\=]+)\s*(\=)?\s*([\'\"]?)', $v)) {
-      if (!$r[2]) {/* no '=' */
-        if ($r[1] == '/') {
-          return array(0, $r[4]);
-        }
-        return array(array('k' => $r[1], 'value' => 1, 'values' => array(1)), $r[4]);
-      }
-      if (!$r[3]) {/* no quots */
-        if ($sub_r = $this->x('([^\s]+)', $r[4])) {
-          return array(array('k' => $r[1], 'value' => $sub_r[1], 'values' => array($sub_r[1])), $sub_r[2]);
-        }
-        return array(array('k' => $r[1], 'value' => '', 'values' => array()), $r[4]);
-      }
-      $val = '';
-      $multi = 0;
-      $sub_v = $r[4];
-      while ($sub_v && (!$sub_r = $this->x('(\x5c\\' .$r[3]. '|\\' .$r[3]. ')', $sub_v))) {
-        $val .= substr($sub_v, 0, 1);
-        $sub_v = substr($sub_v, 1);
-      }
-      $sub_v = $sub_v ? $sub_r[2] : $sub_v;
-      $vals = preg_split('/ /', $val);
-      return array(array('k' => $r[1], 'value' => $val, 'values' => $vals), $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /*  */
-
-  function isEmpty($t, $v) {
-    if (preg_match('/^(area|base|br|col|frame|hr|input|img|link|xmeta|param)$/', $t)) {
-      return 1;
-    }
-    if (preg_match('/\/$/', $v)) {
-      return 1;
-    }
-    return 0;
-  }
-  
-  /*  */
-  
-  function xClose($v) {
-    if ($r = $this->x('\<\/([^\s\>]+)\>', $v)) {
-      return array(array('tag' => strtolower($r[1])), $r[2]);
-    }
-    return array(0, $v);
-  }
-
-  /*  */
-  
-  function xCData($v) {
-    if (preg_match('/(script|style)/i', $this->cur_tag)) {
-      if ($r = $this->x('(.+)(\<\/' . $this->cur_tag . '\>)', $v, 'Uis')) {
-        return array($r[1], $r[2] . $r[3]);
-      }
-    }
-    elseif ($r = $this->x('([^\<]+)', $v, 'si', $this->keep_cdata_ws)) {
-      return array($r[1], $r[2]);
-    }
-    return array(0, $v);
-  }
-
-  /*  */
-
-  function extractRDF($formats = '') {
-    $this->node_index = $this->getNodeIndex();
-    $formats = !$formats ? $this->v('sem_html_formats', $this->default_sem_html_formats, $this->a) : $formats;
-    $formats = preg_split('/ /', $formats);
-    foreach ($formats as $format) {
-      if (!in_array($format, $this->extracted_formats)) {
-        $comp = $this->camelCase($format) . 'Extractor';
-        if (ARC2::inc($comp)) {
-          $cls = 'ARC2_' . $comp;
-          $e = new $cls($this->a, $this);
-          $e->extractRDF();
-        }
-        $this->extracted_formats[] = $format;
-      }
-    }
-  }
-  
-  function getNode($id) {
-    return isset($this->nodes[$id]) ? $this->nodes[$id] : 0;
-  }
-  
-  /*  */
-  
-}
\ No newline at end of file
diff --git a/libraries/ARC2/parsers/ARC2_TurtleParser.php b/libraries/ARC2/parsers/ARC2_TurtleParser.php
deleted file mode 100644
index 61d4c6a46..000000000
--- a/libraries/ARC2/parsers/ARC2_TurtleParser.php
+++ /dev/null
@@ -1,882 +0,0 @@
-<?php
-/**
- * ARC2 SPARQL-enhanced Turtle Parser
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-04-11
-*/
-
-ARC2::inc('RDFParser');
-
-class ARC2_TurtleParser extends ARC2_RDFParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* reader */
-    parent::__init();
-    $this->state = 0;
-    $this->xml = 'http://www.w3.org/XML/1998/namespace';
-    $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $this->xsd = 'http://www.w3.org/2001/XMLSchema#';
-    $this->nsp = array($this->xml => 'xml', $this->rdf => 'rdf', $this->xsd => 'xsd');
-    $this->unparsed_code = '';
-    $this->max_parsing_loops = $this->v('turtle_max_parsing_loops', 500, $this->a);
-  }
-  
-  /*  */
-  
-  function x($re, $v, $options = 'si') {
-    $v = preg_replace('/^[\xA0\xC2]+/', ' ', $v);
-    while (preg_match('/^\s*(\#[^\xd\xa]*)(.*)$/si', $v, $m)) {/* comment removal */
-      $v = $m[2];
-    }
-    return ARC2::x($re, $v, $options);
-    //$this->unparsed_code = ($sub_r && count($sub_r)) ? $sub_r[count($sub_r) - 1] : '';
-  }
-
-  function createBnodeID(){
-    $this->bnode_id++;
-    return '_:' . $this->bnode_prefix . $this->bnode_id;
-  }
-
-  /*  */
-  
-  function addT($t) {
-    if ($this->skip_dupes) {
-      $h = md5(serialize($t));
-      if (!isset($this->added_triples[$h])) {
-        $this->triples[$this->t_count] = $t;
-        $this->t_count++;
-        $this->added_triples[$h] = true;
-      }
-    }
-    else {
-      $this->triples[$this->t_count] = $t;
-      $this->t_count++;
-    }
-  }
-
-  /*  */
-
-  function getTriples() {
-    return $this->v('triples', array());
-  }
-  
-  function countTriples() {
-    return $this->t_count;
-  }
-  
-  /*  */
-  
-  function getUnparsedCode() {
-    return $this->v('unparsed_code', '');
-  }
-  
-  /*  */
-  
-  function setDefaultPrefixes() {
-    $this->prefixes = array(
-      'rdf:' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-      'rdfs:' => 'http://www.w3.org/2000/01/rdf-schema#',
-      'owl:' => 'http://www.w3.org/2002/07/owl#',
-      'xsd:' => 'http://www.w3.org/2001/XMLSchema#',
-    );
-    if ($ns = $this->v('ns', array(), $this->a)) {
-      foreach ($ns as $p => $u) $this->prefixes[$p . ':'] = $u;
-    }
-  }
-  
-
-  function parse($path, $data = '', $iso_fallback = false) {
-    $this->setDefaultPrefixes();
-    /* reader */
-    if (!$this->v('reader')) {
-      ARC2::inc('Reader');
-      $this->reader = new ARC2_Reader($this->a, $this);
-    }
-    $this->reader->setAcceptHeader('Accept: application/x-turtle; q=0.9, */*; q=0.1');
-    $this->reader->activate($path, $data);
-    $this->base = $this->v1('base', $this->reader->base, $this->a);
-    $this->r = array('vars' => array());
-    /* parse */
-    $buffer = '';
-    $more_triples = array();
-    $sub_v = '';
-    $sub_v2 = '';
-    $loops = 0;
-    $prologue_done = 0;
-    while ($d = $this->reader->readStream(0)) {
-      $buffer .= $d;
-      $sub_v = $buffer;
-      do {
-        $proceed = 0;
-        if (!$prologue_done) {
-          $proceed = 1;
-          if ((list($sub_r, $sub_v) = $this->xPrologue($sub_v)) && $sub_r) {
-            $loops = 0;
-            $sub_v .= $this->reader->readStream(0, 128);
-            /* we might have missed the final DOT in the previous prologue loop */
-            if ($sub_r = $this->x('\.', $sub_v)) $sub_v = $sub_r[1];
-            if ($this->x("\@?(base|prefix)", $sub_v)) {/* more prologue to come, use outer loop */
-              $proceed = 0;
-            }
-          }
-          else {
-            $prologue_done = 1;
-          }
-        }
-        if ($prologue_done && (list($sub_r, $sub_v, $more_triples, $sub_v2) = $this->xTriplesBlock($sub_v)) && is_array($sub_r)) {
-          $proceed = 1;
-          $loops = 0;
-          foreach ($sub_r as $t) {
-            $this->addT($t);
-          }
-        }
-      } while ($proceed);
-      $loops++;
-      $buffer = $sub_v;
-      if ($loops > $this->max_parsing_loops) {/* most probably a parser or code bug, might also be a huge object value, though */
-        $this->addError('too many loops: ' . $loops . '. Could not parse "' . substr($buffer, 0, 200) . '..."');
-        break;
-      }
-    }
-    foreach ($more_triples as $t) {
-      $this->addT($t);
-    }
-    $sub_v = count($more_triples) ? $sub_v2 : $sub_v;
-    $buffer = $sub_v;
-    $this->unparsed_code = $buffer;
-    $this->reader->closeStream();
-    unset($this->reader);
-    /* remove trailing comments */
-    while (preg_match('/^\s*(\#[^\xd\xa]*)(.*)$/si', $this->unparsed_code, $m)) $this->unparsed_code = $m[2];
-    if ($this->unparsed_code && !$this->getErrors()) {
-      $rest = preg_replace('/[\x0a|\x0d]/i', ' ', substr($this->unparsed_code, 0, 30));
-      if (trim($rest)) $this->addError('Could not parse "' . $rest . '"');
-    }
-    return $this->done();
-  }
-
-  function xPrologue($v) {
-    $r = 0;
-    if (!$this->t_count) {
-      if ((list($sub_r, $v) = $this->xBaseDecl($v)) && $sub_r) {
-        $this->base = $sub_r;
-        $r = 1;
-      }
-      while ((list($sub_r, $v) = $this->xPrefixDecl($v)) && $sub_r) {
-        $this->prefixes[$sub_r['prefix']] = $sub_r['uri'];
-        $r = 1;
-      }
-    }
-    return array($r, $v);
-  }
-  
-  /* 3 */
-
-  function xBaseDecl($v) {
-    if ($r = $this->x("\@?base\s+", $v)) {
-      if ((list($r, $sub_v) = $this->xIRI_REF($r[1])) && $r) {
-        if ($sub_r = $this->x('\.', $sub_v)) {
-          $sub_v = $sub_r[1];
-        }
-        return array($r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 4 */
-  
-  function xPrefixDecl($v) {
-    if ($r = $this->x("\@?prefix\s+", $v)) {
-      if ((list($r, $sub_v) = $this->xPNAME_NS($r[1])) && $r) {
-        $prefix = $r;
-        if((list($r, $sub_v) = $this->xIRI_REF($sub_v)) && $r) {
-          $uri = $this->calcURI($r, $this->base);
-          if ($sub_r = $this->x('\.', $sub_v)) {
-            $sub_v = $sub_r[1];
-          }
-          return array(array('prefix' => $prefix, 'uri_ref' => $r, 'uri' => $uri), $sub_v);
-        }
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 21.., 32.. */
-  
-  function xTriplesBlock($v) {
-    $pre_r = array();
-    $r = array();
-    $state = 1;
-    $sub_v = $v;
-    $buffer = $sub_v;
-    do {
-      $proceed = 0;
-      if ($state == 1) {/* expecting subject */
-        $t = array('type' => 'triple', 's' => '', 'p' => '', 'o' => '', 's_type' => '', 'p_type' => '', 'o_type' => '', 'o_datatype' => '', 'o_lang' => '');
-        if ((list($sub_r, $sub_v) = $this->xVarOrTerm($sub_v)) && $sub_r) {
-          $t['s'] = $sub_r['value'];
-          $t['s_type'] = $sub_r['type'];
-          $state = 2;
-          $proceed = 1;
-          if ($sub_r = $this->x('(\}|\.)', $sub_v)) {
-            if ($t['s_type'] == 'placeholder') {
-              $state = 4;
-            }
-            else {
-              $this->addError('"' . $sub_r[1]. '" after subject found.');
-            }
-          }
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xCollection($sub_v)) && $sub_r) {
-          $t['s'] = $sub_r['id'];
-          $t['s_type'] = $sub_r['type'];
-          $pre_r = array_merge($pre_r, $sub_r['triples']);
-          $state = 2;
-          $proceed = 1;
-          if ($sub_r = $this->x('\.', $sub_v)) {
-            $this->addError('DOT after subject found.');
-          }
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xBlankNodePropertyList($sub_v)) && $sub_r) {
-          $t['s'] = $sub_r['id'];
-          $t['s_type'] = $sub_r['type'];
-          $pre_r = array_merge($pre_r, $sub_r['triples']);
-          $state = 2;
-          $proceed = 1;
-        }
-        elseif ($sub_r = $this->x('\.', $sub_v)) {
-          $this->addError('Subject expected, DOT found.' . $sub_v);
-        }
-      }
-      if ($state == 2) {/* expecting predicate */
-        if ($sub_r = $this->x('a\s+', $sub_v)) {
-          $sub_v = $sub_r[1];
-          $t['p'] = $this->rdf . 'type';
-          $t['p_type'] = 'uri';
-          $state = 3;
-          $proceed = 1;
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xVarOrTerm($sub_v)) && $sub_r) {
-          if ($sub_r['type'] == 'bnode') {
-            $this->addError('Blank node used as triple predicate');
-          }
-          $t['p'] = $sub_r['value'];
-          $t['p_type'] = $sub_r['type'];
-          $state = 3;
-          $proceed = 1;
-        }
-        elseif ($sub_r = $this->x('\.', $sub_v)) {
-          $state = 4;          
-        }
-        elseif ($sub_r = $this->x('\}', $sub_v)) {
-          $buffer = $sub_v;
-          $r = array_merge($r, $pre_r);
-          $pre_r = array();
-          $proceed = 0;
-        }
-      }
-      if ($state == 3) {/* expecting object */
-        if ((list($sub_r, $sub_v) = $this->xVarOrTerm($sub_v)) && $sub_r) {
-          $t['o'] = $sub_r['value'];
-          $t['o_type'] = $sub_r['type'];
-          $t['o_lang'] = $this->v('lang', '', $sub_r);
-          $t['o_datatype'] = $this->v('datatype', '', $sub_r);
-          $pre_r[] = $t;
-          $state = 4;
-          $proceed = 1;
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xCollection($sub_v)) && $sub_r) {
-          $t['o'] = $sub_r['id'];
-          $t['o_type'] = $sub_r['type'];
-          $pre_r = array_merge($pre_r, array($t), $sub_r['triples']);
-          $state = 4;
-          $proceed = 1;
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xBlankNodePropertyList($sub_v)) && $sub_r) {
-          $t['o'] = $sub_r['id'];
-          $t['o_type'] = $sub_r['type'];
-          $pre_r = array_merge($pre_r, array($t), $sub_r['triples']);
-          $state = 4;
-          $proceed = 1;
-        }
-      }
-      if ($state == 4) {/* expecting . or ; or , or } */
-        if ($sub_r = $this->x('\.', $sub_v)) {
-          $sub_v = $sub_r[1];
-          $buffer = $sub_v;
-          $r = array_merge($r, $pre_r);
-          $pre_r = array();
-          $state = 1;
-          $proceed = 1;
-        }
-        elseif ($sub_r = $this->x('\;', $sub_v)) {
-          $sub_v = $sub_r[1];
-          $state = 2;
-          $proceed = 1;
-        }
-        elseif ($sub_r = $this->x('\,', $sub_v)) {
-          $sub_v = $sub_r[1];
-          $state = 3;
-          $proceed = 1;
-          if ($sub_r = $this->x('\}', $sub_v)) {
-            $this->addError('Object expected, } found.');
-          }
-        }
-        if ($sub_r = $this->x('(\}|\{|OPTIONAL|FILTER|GRAPH)', $sub_v)) {
-          $buffer = $sub_v;
-          $r = array_merge($r, $pre_r);
-          $pre_r = array();
-          $proceed = 0;
-        }
-      }
-    } while ($proceed);
-    return count($r) ? array($r, $buffer, $pre_r, $sub_v) : array(0, $buffer, $pre_r, $sub_v);
-  }
-  
-  /* 39.. */
-  
-  function xBlankNodePropertyList($v) {
-    if ($sub_r = $this->x('\[', $v)) {
-      $sub_v = $sub_r[1];
-      $s = $this->createBnodeID();
-      $r = array('id' => $s, 'type' => 'bnode', 'triples' => array());
-      $t = array('type' => 'triple', 's' => $s, 'p' => '', 'o' => '', 's_type' => 'bnode', 'p_type' => '', 'o_type' => '', 'o_datatype' => '', 'o_lang' => '');
-      $state = 2;
-      $closed = 0;
-      do {
-        $proceed = 0;
-        if ($state == 2) {/* expecting predicate */
-          if ($sub_r = $this->x('a\s+', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $t['p'] = $this->rdf . 'type';
-            $t['p_type'] = 'uri';
-            $state = 3;
-            $proceed = 1;
-          }
-          elseif ((list($sub_r, $sub_v) = $this->xVarOrTerm($sub_v)) && $sub_r) {
-            $t['p'] = $sub_r['value'];
-            $t['p_type'] = $sub_r['type'];
-            $state = 3;
-            $proceed = 1;
-          }
-        }
-        if ($state == 3) {/* expecting object */
-          if ((list($sub_r, $sub_v) = $this->xVarOrTerm($sub_v)) && $sub_r) {
-            $t['o'] = $sub_r['value'];
-            $t['o_type'] = $sub_r['type'];
-            $t['o_lang'] = $this->v('lang', '', $sub_r);
-            $t['o_datatype'] = $this->v('datatype', '', $sub_r);
-            $r['triples'][] = $t;
-            $state = 4;
-            $proceed = 1;
-          }
-          elseif ((list($sub_r, $sub_v) = $this->xCollection($sub_v)) && $sub_r) {
-            $t['o'] = $sub_r['id'];
-            $t['o_type'] = $sub_r['type'];
-            $r['triples'] = array_merge($r['triples'], array($t), $sub_r['triples']);
-            $state = 4;
-            $proceed = 1;
-          }
-          elseif((list($sub_r, $sub_v) = $this->xBlankNodePropertyList($sub_v)) && $sub_r) {
-            $t['o'] = $sub_r['id'];
-            $t['o_type'] = $sub_r['type'];
-            $r['triples'] = array_merge($r['triples'], array($t), $sub_r['triples']);
-            $state = 4;
-            $proceed = 1;
-          }
-        }
-        if ($state == 4) {/* expecting . or ; or , or ] */
-          if ($sub_r = $this->x('\.', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $state = 1;
-            $proceed = 1;
-          }
-          if ($sub_r = $this->x('\;', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $state = 2;
-            $proceed = 1;
-          }
-          if ($sub_r = $this->x('\,', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $state = 3;
-            $proceed = 1;
-          }
-          if ($sub_r = $this->x('\]', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $proceed = 0;
-            $closed = 1;
-          }
-        }
-      } while ($proceed);
-      if ($closed) {
-        return array($r, $sub_v);
-      }
-      return array(0, $v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 40.. */
-  
-  function xCollection($v) {
-    if ($sub_r = $this->x('\(', $v)) {
-      $sub_v = $sub_r[1];
-      $s = $this->createBnodeID();
-      $r = array('id' => $s, 'type' => 'bnode', 'triples' => array());
-      $closed = 0;
-      do {
-        $proceed = 0;
-        if ((list($sub_r, $sub_v) = $this->xVarOrTerm($sub_v)) && $sub_r) {
-          $r['triples'][] = array('type' => 'triple', 's' => $s, 'p' => $this->rdf . 'first', 'o' => $sub_r['value'], 's_type' => 'bnode', 'p_type' => 'uri', 'o_type' => $sub_r['type'], 'o_lang' => $this->v('lang', '', $sub_r), 'o_datatype' => $this->v('datatype', '', $sub_r));
-          $proceed = 1;
-        }
-        elseif ((list($sub_r, $sub_v) = $this->xCollection($sub_v)) && $sub_r) {
-          $r['triples'][] = array('type' => 'triple', 's' => $s, 'p' => $this->rdf . 'first', 'o' => $sub_r['id'], 's_type' => 'bnode', 'p_type' => 'uri', 'o_type' => $sub_r['type'], 'o_lang' => '', 'o_datatype' => '');
-          $r['triples'] = array_merge($r['triples'], $sub_r['triples']);
-          $proceed = 1;
-        }
-        elseif((list($sub_r, $sub_v) = $this->xBlankNodePropertyList($sub_v)) && $sub_r) {
-          $r['triples'][] = array('type' => 'triple', 's' => $s, 'p' => $this->rdf . 'first', 'o' => $sub_r['id'], 's_type' => 'bnode', 'p_type' => 'uri', 'o_type' => $sub_r['type'], 'o_lang' => '', 'o_datatype' => '');
-          $r['triples'] = array_merge($r['triples'], $sub_r['triples']);
-          $proceed = 1;
-        }
-        if ($proceed) {
-          if ($sub_r = $this->x('\)', $sub_v)) {
-            $sub_v = $sub_r[1];
-            $r['triples'][] = array('type' => 'triple', 's' => $s, 'p' => $this->rdf . 'rest', 'o' => $this->rdf . 'nil', 's_type' => 'bnode', 'p_type' => 'uri', 'o_type' => 'uri', 'o_lang' => '', 'o_datatype' => '');
-            $closed = 1;
-            $proceed = 0;
-          }
-          else {
-            $next_s = $this->createBnodeID();
-            $r['triples'][] = array('type' => 'triple', 's' => $s, 'p' => $this->rdf . 'rest', 'o' => $next_s, 's_type' => 'bnode', 'p_type' => 'uri', 'o_type' => 'bnode', 'o_lang' => '', 'o_datatype' => '');
-            $s = $next_s;
-          }
-        }
-      } while ($proceed);
-      if ($closed) {
-        return array($r, $sub_v);
-      }
-    }
-    return array (0, $v);
-  }
-  
-  /* 42 */
-  
-  function xVarOrTerm($v) {
-    if ((list($sub_r, $sub_v) = $this->xVar($v)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    elseif ((list($sub_r, $sub_v) = $this->xGraphTerm($v)) && $sub_r) {
-      return array($sub_r, $sub_v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 44, 74.., 75.. */
-  
-  function xVar($v) {
-    if ($r = $this->x('(\?|\$)([^\s]+)', $v)) {
-      if ((list($sub_r, $sub_v) = $this->xVARNAME($r[2])) && $sub_r) {
-        if (!in_array($sub_r, $this->r['vars'])) {
-          $this->r['vars'][] = $sub_r;
-        }
-        return array(array('value' => $sub_r, 'type' => 'var'), $sub_v . $r[3]);
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 45 */
-  
-  function xGraphTerm($v) {
-    foreach (array(
-      'IRIref' => 'uri', 
-      'RDFLiteral' => 'literal', 
-      'NumericLiteral' => 'literal', 
-      'BooleanLiteral' => 'literal', 
-      'BlankNode' => 'bnode', 
-      'NIL' => 'uri',
-      'Placeholder' => 'placeholder'
-    ) as $term => $type) {
-      $m = 'x' . $term;
-      if ((list($sub_r, $sub_v) = $this->$m($v)) && $sub_r) {
-        if (!is_array($sub_r)) {
-          $sub_r = array('value' => $sub_r);
-        }
-        $sub_r['type'] = $this->v1('type', $type, $sub_r);
-        return array($sub_r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-
-  /* 60 */
-  
-  function xRDFLiteral($v) {
-    if ((list($sub_r, $sub_v) = $this->xString($v)) && $sub_r) {
-      $sub_r['value'] = $this->unescapeNtripleUTF($sub_r['value']);
-      $r = $sub_r;
-      if ((list($sub_r, $sub_v) = $this->xLANGTAG($sub_v)) && $sub_r) {
-        $r['lang'] = $sub_r;
-      }
-      elseif (!$this->x('\s', $sub_v) && ($sub_r = $this->x('\^\^', $sub_v)) && (list($sub_r, $sub_v) = $this->xIRIref($sub_r[1])) && $sub_r[1]) {
-        $r['datatype'] = $sub_r;
-      }
-      return array($r, $sub_v);
-    }
-    return array(0, $v);
-  }
-
-  /* 61.., 62.., 63.., 64.. */  
-  
-  function xNumericLiteral($v) {
-    $sub_r = $this->x('(\-|\+)?', $v);
-    $prefix = $sub_r[1];
-    $sub_v = $sub_r[2];
-    foreach (array('DOUBLE' => 'double', 'DECIMAL' => 'decimal', 'INTEGER' => 'integer') as $type => $xsd) {
-      $m = 'x' . $type;
-      if ((list($sub_r, $sub_v) = $this->$m($sub_v)) && ($sub_r !== false)) {
-        $r = array('value' => $prefix . $sub_r, 'type' => 'literal', 'datatype' => $this->xsd . $xsd);
-        return array($r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 65.. */
-  
-  function xBooleanLiteral($v) {
-    if ($r = $this->x('(true|false)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(0, $v);
-  }
-
-  /* 66.., 87.., 88.., 89.., 90.., 91.. */
-  
-  function xString($v) {/* largely simplified, may need some tweaks in following revisions */
-    $sub_v = $v;
-    if (!preg_match('/^\s*([\']{3}|\'|[\"]{3}|\")(.*)$/s', $sub_v, $m)) return array(0, $v);
-    $delim = $m[1];
-    $rest = $m[2];
-    $sub_types = array("'''" => 'literal_long1', '"""' => 'literal_long2', "'" => 'literal1', '"' => 'literal2');
-    $sub_type = $sub_types[$delim];
-    $pos = 0;
-    $r = false;
-    do {
-      $proceed = 0;
-      $delim_pos = strpos($rest, $delim, $pos);
-      if ($delim_pos === false) break;
-      $new_rest = substr($rest, $delim_pos + strlen($delim));
-      $r = substr($rest, 0, $delim_pos);
-      if (!preg_match('/([\x5c]+)$/s', $r, $m) || !(strlen($m[1]) % 2)) {
-        $rest = $new_rest;
-      }
-      else {
-        $r = false;
-        $pos = $delim_pos + 1;
-        $proceed = 1;
-      }
-    } while ($proceed);
-    if ($r !== false) {
-      return array(array('value' => $this->toUTF8($r) , 'type' => 'literal', 'sub_type' => $sub_type), $rest);
-    }
-    return array(0, $v);
-  }
-  
-  /* 67 */
-  
-  function xIRIref($v) {
-    if ((list($r, $v) = $this->xIRI_REF($v)) && $r) {
-      return array($this->calcURI($r, $this->base), $v);
-    }
-    elseif ((list($r, $v) = $this->xPrefixedName($v)) && $r) {
-      return array($r, $v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 68 */
-  
-  function xPrefixedName($v) {
-    if ((list($r, $v) = $this->xPNAME_LN($v)) && $r) {
-      return array($r, $v);
-    }
-    elseif ((list($r, $sub_v) = $this->xPNAME_NS($v)) && $r) {
-      return isset($this->prefixes[$r]) ? array($this->prefixes[$r], $sub_v) : array(0, $v);
-    }
-    return array(0, $v);
-  }
-  
-  /* 69.., 73.., 93, 94..  */
-  
-  function xBlankNode($v) {
-    if (($r = $this->x('\_\:', $v)) && (list($r, $sub_v) = $this->xPN_LOCAL($r[1])) && $r) {
-      return array(array('type' => 'bnode', 'value' => '_:' . $r), $sub_v);
-    }
-    if ($r = $this->x('\[[\x20\x9\xd\xa]*\]', $v)) {
-      return array(array('type' => 'bnode', 'value' => $this->createBnodeID()), $r[1]);
-    }
-    return array(0, $v);
-  }
-
-  /* 70.. @@sync with SPARQLParser */
-  
-  function xIRI_REF($v) {
-    //if ($r = $this->x('\<([^\<\>\"\{\}\|\^\'[:space:]]*)\>', $v)) {
-    if (($r = $this->x('\<(\$\{[^\>]*\})\>', $v)) && ($sub_r = $this->xPlaceholder($r[1]))) {
-      return array($r[1], $r[2]);
-    }
-    elseif ($r = $this->x('\<\>', $v)) {
-      return array(true, $r[1]);
-    }
-    elseif ($r = $this->x('\<([^\s][^\<\>]*)\>', $v)) {
-      return array($r[1] ? $r[1] : true, $r[2]);
-    }
-    return array(0, $v);
-  }
-  
-  /* 71 */
-  
-  function xPNAME_NS($v) {
-    list($r, $sub_v) = $this->xPN_PREFIX($v);
-    $prefix = $r ? $r : '';
-    return ($r = $this->x("\:", $sub_v)) ? array($prefix . ':', $r[1]) : array(0, $v);
-  }
-
-  /* 72 */
-  
-  function xPNAME_LN($v) {
-    if ((list($r, $sub_v) = $this->xPNAME_NS($v)) && $r) {
-      if (!$this->x('\s', $sub_v) && (list($sub_r, $sub_v) = $this->xPN_LOCAL($sub_v)) && $sub_r) {
-        if (!isset($this->prefixes[$r])) {
-          return array(0, $v);
-        }
-        return array($this->prefixes[$r] . $sub_r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* 76 */
-  
-  function xLANGTAG($v) {
-    if (!$this->x('\s', $v) && ($r = $this->x('\@([a-z]+(\-[a-z0-9]+)*)', $v))) {
-      return array($r[1], $r[3]);
-    }
-    return array(0, $v);
-  }
-  
-  /* 77.. */
-  
-  function xINTEGER($v) {
-    if ($r = $this->x('([0-9]+)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(false, $v);
-  }
-
-  /* 78.. */
-
-  function xDECIMAL($v) {
-    if ($r = $this->x('([0-9]+\.[0-9]*)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    if ($r = $this->x('(\.[0-9]+)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(false, $v);
-  }
-
-  /* 79.., 86.. */
-
-  function xDOUBLE($v) {
-    if ($r = $this->x('([0-9]+\.[0-9]*E[\+\-]?[0-9]+)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    if ($r = $this->x('(\.[0-9]+E[\+\-]?[0-9]+)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    if ($r = $this->x('([0-9]+E[\+\-]?[0-9]+)', $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(false, $v);
-  }
-  
-  /* 92 */
-  
-  function xNIL($v) {
-    if ($r = $this->x('\([\x20\x9\xd\xa]*\)', $v)) {
-      return array(array('type' => 'uri', 'value' => $this->rdf . 'nil'), $r[1]);
-    }
-    return array(0, $v);
-  }
-
-  /* 95.. */
-  
-  function xPN_CHARS_BASE($v) {
-    if ($r = $this->x("([a-z]+|\\\u[0-9a-f]{1,4})", $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(0, $v);
-  }
-
-  /* 96 */
-  
-  function xPN_CHARS_U($v) {
-    if ((list($r, $sub_v) = $this->xPN_CHARS_BASE($v)) && $r) {
-      return array($r, $sub_v);
-    }
-    elseif ($r = $this->x("(_)", $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(0, $v);
-  }
-
-  /* 97.. */
-  
-  function xVARNAME($v) {
-    $r = '';
-    do {
-      $proceed = 0;
-      if ($sub_r = $this->x('([0-9]+)', $v)) {
-        $r .= $sub_r[1];
-        $v = $sub_r[2];
-        $proceed = 1;
-      }
-      elseif ((list($sub_r, $sub_v) = $this->xPN_CHARS_U($v)) && $sub_r) {
-        $r .= $sub_r;
-        $v = $sub_v;
-        $proceed = 1;
-      }
-      elseif ($r && ($sub_r = $this->x('([\xb7\x300-\x36f]+)', $v))) {
-        $r .= $sub_r[1];
-        $v = $sub_r[2];
-        $proceed = 1;
-      }
-    } while ($proceed);
-    return array($r, $v);
-  }
-
-  /* 98.. */
-  
-  function xPN_CHARS($v) {
-    if ((list($r, $sub_v) = $this->xPN_CHARS_U($v)) && $r) {
-      return array($r, $sub_v);
-    }
-    elseif ($r = $this->x('([\-0-9\xb7\x300-\x36f])', $v)) {
-      return array($r[1], $r[2]);
-    }
-    return array(false, $v);
-  }
-
-  /* 99 */
-  
-  function xPN_PREFIX($v) {
-    if ($sub_r = $this->x("([^\s\:\(\)\{\}\;\,]+)", $v, 's')) {/* accelerator */
-      return array($sub_r[1], $sub_r[2]);/* @@testing */
-    }
-    if ((list($r, $sub_v) = $this->xPN_CHARS_BASE($v)) && $r) {
-      do {
-        $proceed = 0;
-        list($sub_r, $sub_v) = $this->xPN_CHARS($sub_v);
-        if ($sub_r !== false) {
-          $r .= $sub_r;
-          $proceed = 1;
-        }
-        elseif ($sub_r = $this->x("\.", $sub_v)) {
-          $r .= '.';
-          $sub_v = $sub_r[1];
-          $proceed = 1;
-        }
-      } while ($proceed);
-      list($sub_r, $sub_v) = $this->xPN_CHARS($sub_v);
-      $r .= $sub_r ? $sub_r : '';
-    }
-    return array($r, $sub_v);
-  }
-  
-  /* 100 */
-  
-  function xPN_LOCAL($v) {
-    if (($sub_r = $this->x("([^\s\(\)\{\}\[\]\;\,\.]+)", $v, 's')) && !preg_match('/^\./', $sub_r[2])) {/* accelerator */
-      return array($sub_r[1], $sub_r[2]);/* @@testing */
-    }
-    $r = '';
-    $sub_v = $v;
-    do {
-      $proceed = 0;
-      if ($this->x('\s', $sub_v)) {
-        return array($r, $sub_v);
-      }
-      if ($sub_r = $this->x('([0-9])', $sub_v)) {
-        $r .= $sub_r[1];
-        $sub_v = $sub_r[2];
-        $proceed = 1;
-      }
-      elseif ((list($sub_r, $sub_v) = $this->xPN_CHARS_U($sub_v)) && $sub_r) {
-        $r .= $sub_r;
-        $proceed = 1;
-      }
-      elseif ($r) {
-        if (($sub_r = $this->x('(\.)', $sub_v)) && !preg_match('/^[\s\}]/s', $sub_r[2])) {
-          $r .= $sub_r[1];
-          $sub_v = $sub_r[2];
-        }
-        if ((list($sub_r, $sub_v) = $this->xPN_CHARS($sub_v)) && $sub_r) {
-          $r .= $sub_r;
-          $proceed = 1;
-        }
-      }
-    } while ($proceed);
-    return array($r, $sub_v);
-  }
-  
-  /*  */
-  
-  function unescapeNtripleUTF($v) {
-    if (strpos($v, '\\') === false) return $v;
-    $mappings = array('t' => "\t", 'n' => "\n", 'r' => "\r", '\"' => '"', '\'' => "'");
-    foreach ($mappings as $in => $out) {
-      $v = preg_replace('/\x5c([' . $in . '])/', $out, $v);
-    }
-    if (strpos(strtolower($v), '\u') === false) return $v;
-    while (preg_match('/\\\(U)([0-9A-F]{8})/', $v, $m) || preg_match('/\\\(u)([0-9A-F]{4})/', $v, $m)) {
-      $no = hexdec($m[2]);
-  		if ($no < 128) $char = chr($no);
-      else if ($no < 2048) $char = chr(($no >> 6) + 192) . chr(($no & 63) + 128);
-      else if ($no < 65536) $char = chr(($no >> 12) + 224) . chr((($no >> 6) & 63) + 128) . chr(($no & 63) + 128);
-  		else if ($no < 2097152) $char = chr(($no >> 18) + 240) . chr((($no >> 12) & 63) + 128) . chr((($no >> 6) & 63) + 128) . chr(($no & 63) + 128);
-      else $char= '';
-      $v = str_replace('\\' . $m[1] . $m[2], $char, $v);
-    }
-    return $v;
-  }
-  
-  /*  */
-  
-  function xPlaceholder($v) {
-    //if ($r = $this->x('(\?|\$)\{([^\}]+)\}', $v)) {
-    if ($r = $this->x('(\?|\$)', $v)) {
-      if (preg_match('/(\{(?:[^{}]+|(?R))*\})/', $r[2], $m) && strpos(trim($r[2]), $m[1]) === 0) {
-        $ph = substr($m[1], 1, -1);
-        $rest = substr(trim($r[2]), strlen($m[1]));
-        if (!isset($this->r['placeholders'])) $this->r['placeholders'] = array();
-        if (!in_array($ph, $this->r['placeholders'])) $this->r['placeholders'][] = $ph;
-        return array(array('value' => $ph, 'type' => 'placeholder'), $rest);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /*  */
-}
diff --git a/libraries/ARC2/serializers/ARC2_LegacyHTMLSerializer.php b/libraries/ARC2/serializers/ARC2_LegacyHTMLSerializer.php
deleted file mode 100644
index 580095ebc..000000000
--- a/libraries/ARC2/serializers/ARC2_LegacyHTMLSerializer.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Legacy XML Serializer
-author:   Benjamin Nowack
-version:  2008-08-04
-*/
-
-ARC2::inc('Class');
-
-class ARC2_LegacyHTMLSerializer extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'text/html';
-  }
-
-  /*  */
-  
-  function getSerializedArray($struct, $root = 1, $ind = ' ') {
-    $n = "\n";
-    $r = '';
-    $is_flat = $this->isAssociativeArray($struct) ? 0 : 1;
-    foreach ($struct as $k => $v) {
-      if (!$is_flat) $r .= $n . $ind . $ind . '<dt>' . $k . '</dt>';
-      $r .= $n . $ind . $ind . '<dd>' . (is_array($v) ? $this->getSerializedArray($v, 0, $ind . $ind . $ind) . $n . $ind . $ind : htmlspecialchars($v)) . '</dd>';
-    }
-    return $n . $ind . '<dl>' . $r . $n . $ind . '</dl>';
-  }
-  
-  /*  */
-
-  function isAssociativeArray($v) {
-    foreach (array_keys($v) as $k => $val) {
-      if ($k !== $val) return 1;
-    }
-    return 0;
-  }
-  
-  /*  */
-
-  function getSerializedNode($index, $node, $level = 0, $raw = 0) {
-    $r = '';
-    $tag = $this->v('tag', '', $node);
-    if (preg_match('/^(comment|script)$/', $tag)) {
-    }
-    elseif ($tag == 'cdata') {
-      $r .= $this->v('cdata', '', $node);
-      $r .= $this->v('value', '', $node['a']);
-    }
-    else {
-      /* open tag */
-      if (preg_match('/^(div|form|p|section)$/', $tag)) {
-        $r .= str_pad("\n", $level + 1, "  ");
-      }
-      $r .= '<' . $tag;
-      $attrs = $this->v('a', array(), $node);
-      foreach ($attrs as $k => $v) {
-        /* use uri, if detected */
-        if ($k != 'id') {
-          $v = $this->v($k . ' uri', $v, $attrs);
-        }
-        /* skip arrays and other derived attrs */
-        if (preg_match('/\s/s', $k)) continue;
-        $r .= ' ' . $k . '="' . $v . '"';
-      }
-      if ($node['empty']) {
-        $r .= '/>';
-      }
-      else {
-        $r .= '>';
-        /* cdata */
-        $r .= $this->v('cdata', '', $node);
-        /* sub-nodes */
-        $sub_nodes = $this->v($node['id'], array(), $index);
-        foreach ($sub_nodes as $sub_node) {
-          $r .= $this->getSerializedNode($index, $sub_node, $level + 1, 1);
-        }
-        /* close tag */
-        //$r .= str_pad("\n", $level + 1, "  ") . '</' . $tag . '>';
-        $r .= '</' . $tag . '>';
-        if (preg_match('/^(div|form|p|section)$/', $tag)) {
-          $r .= str_pad("\n", $level + 1, "  ");
-        }
-      }
-    }
-    /* doc envelope, in case of sub-structure serializing */
-    if (!$raw && ($level == 0) && ($node['level'] > 1)) {
-      $r = '<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <head>
-  <body>
-    ' . $r . '
-  </body>
-</html>
-     ';
-    }
-    return $r;
-  }
-
-  /*  */
-}
-
diff --git a/libraries/ARC2/serializers/ARC2_LegacyJSONSerializer.php b/libraries/ARC2/serializers/ARC2_LegacyJSONSerializer.php
deleted file mode 100644
index 9a078df21..000000000
--- a/libraries/ARC2/serializers/ARC2_LegacyJSONSerializer.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Legacy JSON Serializer
-author:   Benjamin Nowack
-version:  2008-08-04
-*/
-
-ARC2::inc('Class');
-
-class ARC2_LegacyJSONSerializer extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'application/json';
-  }
-
-  /*  */
-  
-  function getSerializedArray($struct, $ind = '') {
-    $n = "\n";
-    if (function_exists('json_encode')) return str_replace('","', '",' . $n . '"', json_encode($struct));
-    $r = '';
-    $from = array("\\", "\r", "\t", "\n", '"', "\b", "\f", "/");
-    $to = array('\\\\', '\r', '\t', '\n', '\"', '\b', '\f', '\/');
-    $is_flat = $this->isAssociativeArray($struct) ? 0 : 1;
-    foreach ($struct as $k => $v) {
-      $r .= $r ? ',' . $n . $ind . $ind : $ind . $ind;
-      $r .= $is_flat ? '' : '"' . $k . '": ';
-      $r .= is_array($v) ? $this->getSerializedArray($v, $ind . '  ') : '"' . str_replace($from, $to, $v) . '"';
-    }
-    return $is_flat ? $ind . '[' . $n . $r . $n . $ind . ']' : $ind . '{' . $n . $r . $n . $ind . '}';
-  }
-  
-  /*  */
-
-  function isAssociativeArray($v) {
-    foreach (array_keys($v) as $k => $val) {
-      if ($k !== $val) return 1;
-    }
-    return 0;
-  }
-  
-  /*  */
-
-}
-
diff --git a/libraries/ARC2/serializers/ARC2_LegacyXMLSerializer.php b/libraries/ARC2/serializers/ARC2_LegacyXMLSerializer.php
deleted file mode 100644
index 3d58ba081..000000000
--- a/libraries/ARC2/serializers/ARC2_LegacyXMLSerializer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Legacy XML Serializer
-author:   Benjamin Nowack
-version:  2008-08-04
-*/
-
-ARC2::inc('Class');
-
-class ARC2_LegacyXMLSerializer extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'text/xml';
-  }
-
-  /*  */
-  
-  function getSerializedArray($struct, $root = 1, $ind = '  ') {
-    $n = "\n";
-    $r = '';
-    $is_flat = $this->isAssociativeArray($struct) ? 0 : 1;
-    foreach ($struct as $k => $v) {
-      $tag = $is_flat ? 'item' : preg_replace('/[\s]/s', '_', $k);
-      $tag = preg_replace('/^.*([a-z0-9\-\_]+)$/Uis', '\\1', $tag);
-      $r .= $n . $ind . '<' . $tag . '>' . (is_array($v) ? $this->getSerializedArray($v, 0, $ind . '  ') . $n . $ind : htmlspecialchars($v)) . '</' . $tag . '>';
-    }
-    if ($root) $r = $this->getHead() . $r . $this->getFooter();
-    return $r;
-  }
-  
-  /*  */
-
-  function getHead() {
-    $n = "\n";
-    $r = '<?xml version="1.0"?>';
-    $r .= $n . '<items>';
-    return $r;
-  }
-  
-  function getFooter() {
-    $n = "\n";
-    $r = $n . '</items>';
-    return $r;
-  }
-  
-  /*  */
-
-  function isAssociativeArray($v) {
-    foreach (array_keys($v) as $k => $val) {
-      if ($k !== $val) return 1;
-    }
-    return 0;
-  }
-  
-  /*  */
-
-}
-
diff --git a/libraries/ARC2/serializers/ARC2_MicroRDFSerializer.php b/libraries/ARC2/serializers/ARC2_MicroRDFSerializer.php
deleted file mode 100644
index 11d38b280..000000000
--- a/libraries/ARC2/serializers/ARC2_MicroRDFSerializer.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * ARC2 MicroRDF Serializer
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-24
-*/
-
-ARC2::inc('RDFSerializer');
-
-class ARC2_MicroRDFSerializer extends ARC2_RDFSerializer {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'text/html';
-    $this->label_store = $this->v('label_store', '', $this->a);
-  }
-
-  /*  */
-  
-  function getLabel($res, $ps = '') {
-    if (!$ps) $ps = array();
-    foreach ($ps as $p => $os) {
-      if (preg_match('/[\/\#](name|label|summary|title|fn)$/i', $p)) {
-        return $os[0]['value'];
-      }
-    }
-    if (preg_match('/^\_\:/', $res)) return "An unnamed resource";
-    return $this->extractTermLabel($res);
-    return preg_replace("/^(.*[\/\#])([^\/\#]+)$/", '\\2', str_replace('_', ' ', $res));
-  }
-  
-  function getSerializedIndex($index, $res = '') {
-    $r = '';
-    $n = "\n";
-    if ($res) $index = array($res => $index[$res]);
-    //return Trice::dump($index);
-    $types = $this->v($this->expandPName('rdf:type'), array(), $index);
-    $main_type = $types ? $types[0]['value'] : '';
-    foreach ($index as $s => $ps) {
-      /* node */
-      $r .= '
-        <div class="rdf-item" ' . $this->mdAttrs($s, $main_type) . '>
-          <h3 class="rdf-itemlabel"><a href="' . $s . '">' . ucfirst($this->getLabel($s, $ps))  . '</a></h3>
-      ';
-      /* arcs */
-      foreach ($ps as $p => $os) {
-        $p_cls = strtolower($this->getPName($p));
-        $p_cls = str_replace(':', '-', $p_cls);
-        $r .= '
-          <div class="rdf-prop ' . $p_cls . '">
-            <a class="rdf-proplabel" href="' . $p . '">' . ucfirst($this->getLabel($p)) . ':</a>
-            <ul class="rdf-values">
-        ';
-        $oc = count($os);
-        foreach ($os as $i => $o) {
-          $val = $this->getObjectValue($o, $p);
-          $cls = '';
-          if ($i == 0) $cls .= ($cls ? ' ' : '') . 'first';
-          if ($i == $oc - 1) $cls .= ($cls ? ' ' : '') . 'last';
-          $r .= $n . '<li' . ($cls ? ' class="' . $cls . '"' : '') . '>' . $val . '</li>';
-        }
-        $r .= '
-            </ul>
-            <div class="clb"></div>
-          </div>
-        ';
-      }
-      /* /node */
-      $r .= '
-        <div class="clb"></div>
-        </div>
-      ';
-    }
-    return $r;
-  }
-  
-  function getObjectValue($o, $p) {
-    if ($o['type'] == 'uri') {
-      if (preg_match('/(jpe?g|gif|png)$/i', $o['value'])) {
-        return $this->getImageObjectValue($o, $p);
-      }
-      return $this->getURIObjectValue($o, $p);
-    }
-    if ($o['type'] == "bnode") {
-      return $this->getBNodeObjectValue($o, $p);
-    }
-    return $this->getLiteralObjectValue($o, $p);
-  }
-  
-  function getImageObjectValue($o, $p) {
-    return '<img class="rdf-value" itemprop="' . $p. '" src="' . htmlspecialchars($o['value']) . '" alt="img" />';
-  }
-  
-  function getURIObjectValue($o, $p) {
-    $id = htmlspecialchars($o['value']);
-    $label = $this->getObjectLabel($o['value']);
-    /* differing href */
-    $href = htmlspecialchars($this->v('href', $o['value'], $o));
-    if ($id != $href) {
-      return '<a class="rdf-value" itemprop="' . $p. '" href="' . $id . '" onclick="location.href=\'' . $href . '\';return false">' . $label . '</a>';
-    }
-    return '<a class="rdf-value" itemprop="' . $p. '" href="' . $id . '">' . $label . '</a>';
-    //$label = $o['value'];
-    //$label = preg_replace('/^https?\:\/\/(www\.)?/', '', $label);
-  }
-
-  function getBNodeObjectValue($o, $p) {
-    return '<div class="rdf-value" itemprop="' . $p. '" itemscope="">' . $o['value'] . '</div>';
-    return '<div class="rdf-value" itemprop="' . $p. '" itemscope="">An unnamed resource</div>';
-  }
-
-  function getLiteralObjectValue($o, $p) {
-    return '<div class="rdf-value" itemprop="' . $p. '">' . $o['value'] . '</div>';
-  }
-
-  /*  */
-
-  function getObjectLabel($id) {
-    $r = $this->extractTermLabel($id);
-    if (!$this->label_store) return $r;
-    $q = '
-      SELECT ?val WHERE {
-        <' . $id . '> ?p ?val .
-        FILTER(REGEX(str(?p), "(label|title|name|summary)$"))
-      } LIMIT 1
-    ';
-    $row = $this->label_store->query($q, 'row');
-    return $row ? $row['val'] : $r;
-  }
-
-  /*  */
-  
-}
-
diff --git a/libraries/ARC2/serializers/ARC2_NTriplesSerializer.php b/libraries/ARC2/serializers/ARC2_NTriplesSerializer.php
deleted file mode 100644
index de129f748..000000000
--- a/libraries/ARC2/serializers/ARC2_NTriplesSerializer.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * ARC2 N-Triples Serializer
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-03-29
-*/
-
-ARC2::inc('RDFSerializer');
-
-class ARC2_NTriplesSerializer extends ARC2_RDFSerializer {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->esc_chars = array();
-    $this->raw = 0;
-  }
-
-  /*  */
-  
-  function getTerm($v) {
-    if (!is_array($v)) {
-      if (preg_match('/^\_\:/', $v)) {
-        return $v;
-      }
-      if (preg_match('/^[a-z0-9]+\:[^\s\"]*$/is', $v)) {
-        return '<' . $this->escape($v) . '>';
-      }
-      return $this->getTerm(array('type' => 'literal', 'value' => $v));
-    }
-    if ($v['type'] != 'literal') {
-      return $this->getTerm($v['value']);
-    }
-    /* literal */
-    $quot = '"';
-    if ($this->raw && preg_match('/\"/', $v['value'])) {
-      $quot = "'";
-      if (preg_match('/\'/', $v['value'])) {
-        $quot = '"""';
-        if (preg_match('/\"\"\"/', $v['value']) || preg_match('/\"$/', $v['value']) || preg_match('/^\"/', $v['value'])) {
-          $quot = "'''";
-          $v['value'] = preg_replace("/'$/", "' ", $v['value']);
-          $v['value'] = preg_replace("/^'/", " '", $v['value']);
-          $v['value'] = str_replace("'''", '\\\'\\\'\\\'', $v['value']);
-        }
-      }
-    }
-    if ($this->raw && (strlen($quot) == 1) && preg_match('/[\x0d\x0a]/', $v['value'])) {
-      $quot = $quot . $quot . $quot;
-    }
-    $suffix = isset($v['lang']) && $v['lang'] ? '@' . $v['lang'] : '';
-    $suffix = isset($v['datatype']) && $v['datatype'] ? '^^' . $this->getTerm($v['datatype']) : $suffix;
-    //return $quot . "object" . utf8_encode($v['value']) . $quot . $suffix;
-    return $quot . $this->escape($v['value']) . $quot . $suffix;
-  }
-  
-  function getSerializedIndex($index, $raw = 0) {
-    $this->raw = $raw;
-    $r = '';
-    $nl = "\n";
-    foreach ($index as $s => $ps) {
-      $s = $this->getTerm($s);
-      foreach ($ps as $p => $os) {
-        $p = $this->getTerm($p);
-        if (!is_array($os)) {/* single literal o */
-          $os = array(array('value' => $os, 'type' => 'literal'));
-        }
-        foreach ($os as $o) {
-          $o = $this->getTerm($o);
-          $r .= $r ? $nl : '';
-          $r .= $s . ' ' . $p . ' ' . $o . ' .';
-        }
-      }
-    }
-    return $r . $nl;
-  }
-  
-  /*  */
-
-  function escape($v) {
-    $r = '';
-    $v = (strpos(utf8_decode(str_replace('?', '', $v)), '?') === false) ? utf8_decode($v) : $v;
-    if ($this->raw) return $v;
-    for ($i = 0, $i_max = strlen($v); $i < $i_max; $i++) {
-      $c = $v[$i];
-      if (!isset($this->esc_chars[$c])) {
-        $this->esc_chars[$c] = $this->getEscapedChar($c, $this->getCharNo($c));
-      }
-      $r .= $this->esc_chars[$c];
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function getCharNo($c) {
-    $c_utf = utf8_encode($c);
-    $bl = strlen($c_utf);/* binary length */
-    $r = 0;
-    switch ($bl) {
-      case 1:/* 0####### (0-127) */
-        $r = ord($c_utf);
-        break;
-      case 2:/* 110##### 10###### = 192+x 128+x */
-        $r = ((ord($c_utf[0]) - 192) * 64) + (ord($c_utf[1]) - 128);
-        break;
-      case 3:/* 1110#### 10###### 10###### = 224+x 128+x 128+x */
-        $r = ((ord($c_utf[0]) - 224) * 4096) + ((ord($c_utf[1]) - 128) * 64) + (ord($c_utf[2]) - 128);
-        break;
-      case 4:/* 1111#### 10###### 10###### 10###### = 240+x 128+x 128+x 128+x */
-        $r = ((ord($c_utf[0]) - 240) * 262144) + ((ord($c_utf[1]) - 128) * 4096) + ((ord($c_utf[2]) - 128) * 64) + (ord($c_utf[3]) - 128);
-        break;
-    }
-    return $r;
-  }
-
-  function getEscapedChar($c, $no) {/*see http://www.w3.org/TR/rdf-testcases/#ntrip_strings */
-    if ($no < 9)        return "\\u" . sprintf('%04X', $no);  /* #x0-#x8 (0-8) */
-    if ($no == 9)       return '\t';                          /* #x9 (9) */
-    if ($no == 10)      return '\n';                          /* #xA (10) */
-    if ($no < 13)       return "\\u" . sprintf('%04X', $no);  /* #xB-#xC (11-12) */
-    if ($no == 13)      return '\r';                          /* #xD (13) */
-    if ($no < 32)       return "\\u" . sprintf('%04X', $no);  /* #xE-#x1F (14-31) */
-    if ($no < 34)       return $c;                            /* #x20-#x21 (32-33) */
-    if ($no == 34)      return '\"';                          /* #x22 (34) */
-    if ($no < 92)       return $c;                            /* #x23-#x5B (35-91) */
-    if ($no == 92)      return '\\';                          /* #x5C (92) */
-    if ($no < 127)      return $c;                            /* #x5D-#x7E (93-126) */
-    if ($no < 65536)    return "\\u" . sprintf('%04X', $no);  /* #x7F-#xFFFF (128-65535) */
-    if ($no < 1114112)  return "\\U" . sprintf('%08X', $no);  /* #x10000-#x10FFFF (65536-1114111) */
-    return '';                                                /* not defined => ignore */
-  }
-  
-  /*  */
- 
-}
diff --git a/libraries/ARC2/serializers/ARC2_POSHRDFSerializer.php b/libraries/ARC2/serializers/ARC2_POSHRDFSerializer.php
deleted file mode 100644
index 967a4fad9..000000000
--- a/libraries/ARC2/serializers/ARC2_POSHRDFSerializer.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 POSH RDF Serializer
-author:   Benjamin Nowack
-version:  2008-11-18 (Tweak: Updated to poshRDF spec draft)
-*/
-
-ARC2::inc('RDFSerializer');
-
-class ARC2_POSHRDFSerializer extends ARC2_RDFSerializer {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'text/html';
-  }
-
-  /*  */
-  
-  function getLabel($res, $ps = '') {
-    if (!$ps) $ps = array();
-    foreach ($ps as $p => $os) {
-      if (preg_match('/[\/\#](name|label|summary|title|fn)$/i', $p)) {
-        return $os[0]['value'];
-      }
-    }
-    if (preg_match('/^\_\:/', $res)) return "An unnamed resource";
-    return preg_replace("/^(.*[\/\#])([^\/\#]+)$/", '\\2', str_replace('_', ' ', $res));
-  }
-  
-  function getSerializedIndex($index, $res = '') {
-    $r = '';
-    $n = "\n";
-    if ($res) $index = array($res => $index[$res]);
-    //return Trice::dump($index);
-    foreach ($index as $s => $ps) {
-      /* node */
-      $r .= '
-        <div class="rdf-view">
-          <h3><a class="rdf-s" href="' . $s . '">' . $this->getLabel($s, $ps)  . '</a></h3>
-      ';
-      /* arcs */
-      foreach ($ps as $p => $os) {
-        $r .= '
-          <div class="rdf-o-list">
-            <a class="rdf-p" href="' . $p . '">' . ucfirst($this->getLabel($p)) . '</a>
-        ';
-        foreach ($os as $o) {
-          $r .= $n . $this->getObjectValue($o);
-        }
-        $r .= '    
-          </div>
-        ';
-      }
-      /* node */
-      $r .= '
-        <div class="clb"></div>
-        </div>
-      ';
-    }
-    return $r;
-  }
-  
-  function getObjectValue($o) {
-    if ($o['type'] == 'uri') {
-      if (preg_match('/(jpe?g|gif|png)$/i', $o['value'])) {
-        return $this->getImageObjectValue($o);
-      }
-      return $this->getURIObjectValue($o);
-    }
-    if ($o['type'] == "bnode") {
-      return $this->getBNodeObjectValue($o);
-    }
-    return $this->getLiteralObjectValue($o);
-  }
-  
-  function getImageObjectValue($o) {
-    return '<img class="rdf-o" src="' . htmlspecialchars($o['value']) . '" alt="img" />';
-  }
-  
-  function getURIObjectValue($o) {
-    $href = htmlspecialchars($o['value']);
-    $label = $o['value'];
-    $label = preg_replace('/^https?\:\/\/(www\.)?/', '', $label);
-    return '<a class="rdf-o" href="' . $href . '">' . $label . '</a>';
-  }
-
-  function getBNodeObjectValue($o) {
-    return '<div class="rdf-o" title="' . $o['value']. '">An unnamed resource</div>';
-  }
-
-  function getLiteralObjectValue($o) {
-    return '<div class="rdf-o">' . $o['value'] . '</div>';
-  }
-
-  /*  */
-
-}
-
diff --git a/libraries/ARC2/serializers/ARC2_RDFJSONSerializer.php b/libraries/ARC2/serializers/ARC2_RDFJSONSerializer.php
deleted file mode 100644
index a79c247d0..000000000
--- a/libraries/ARC2/serializers/ARC2_RDFJSONSerializer.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * ARC2 RDF/JSON Serializer
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-03-10
-*/
-
-ARC2::inc('RDFSerializer');
-
-class ARC2_RDFJSONSerializer extends ARC2_RDFSerializer {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'application/json';
-  }
-
-  /*  */
-  
-  function getTerm($v, $term = 's') {
-    if (!is_array($v)) {
-      if (preg_match('/^\_\:/', $v)) {
-        return ($term == 'o') ? $this->getTerm(array('value' => $v, 'type' => 'bnode'), 'o') : '"' . $v . '"';
-      }
-      return ($term == 'o') ? $this->getTerm(array('value' => $v, 'type' => 'uri'), 'o') : '"' . $v . '"';
-    }
-    if (!isset($v['type']) || ($v['type'] != 'literal')) {
-      if ($term != 'o') {
-        return $this->getTerm($v['value'], $term);
-      }
-      if (preg_match('/^\_\:/', $v['value'])) {
-        return '{ "value" : "' . $this->jsonEscape($v['value']) . '", "type" : "bnode" }';
-      }
-      return '{ "value" : "' . $this->jsonEscape($v['value']) . '", "type" : "uri" }';
-    }
-    /* literal */
-    $r = '{ "value" : "' . $this->jsonEscape($v['value']) . '", "type" : "literal"';
-    $suffix = isset($v['datatype']) ? ', "datatype" : "' . $v['datatype'] . '"' : '';
-    $suffix = isset($v['lang']) ? ', "lang" : "' . $v['lang'] . '"' : $suffix;
-    $r .= $suffix . ' }';
-    return $r;
-  }
-
-  function jsonEscape($v) {
-    if (function_exists('json_encode')) return trim(json_encode($v), '"');
-    $from = array("\\", "\r", "\t", "\n", '"', "\b", "\f", "/");
-    $to = array('\\\\', '\r', '\t', '\n', '\"', '\b', '\f', '\/');
-    return str_replace($from, $to, $v);
-  }
-    
-  function getSerializedIndex($index, $raw = 0) {
-    $r = '';
-    $nl = "\n";
-    foreach ($index as $s => $ps) {
-      $r .= $r ? ',' . $nl . $nl : '';
-      $r .= '  ' . $this->getTerm($s). ' : {';
-      $first_p = 1;
-      foreach ($ps as $p => $os) {
-        $r .= $first_p ? $nl : ',' . $nl;
-        $r .= '    ' . $this->getTerm($p). ' : [';
-        $first_o = 1;
-        if (!is_array($os)) {/* single literal o */
-          $os = array(array('value' => $os, 'type' => 'literal'));
-        }
-        foreach ($os as $o) {
-          $r .= $first_o ? $nl : ',' . $nl;
-          $r .= '      ' . $this->getTerm($o, 'o');
-          $first_o = 0;
-        }
-        $first_p = 0;
-        $r .= $nl . '    ]';
-      }
-      $r .= $nl . '  }';
-    }
-    $r .= $r ? ' ' : '';
-    return '{' . $nl . $r . $nl . '}';
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/serializers/ARC2_RDFSerializer.php b/libraries/ARC2/serializers/ARC2_RDFSerializer.php
deleted file mode 100644
index f0090b496..000000000
--- a/libraries/ARC2/serializers/ARC2_RDFSerializer.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * ARC2 RDF Serializer
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2009-11-09
-*/
-
-ARC2::inc('Class');
-
-class ARC2_RDFSerializer extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    foreach ($this->ns as $k => $v) {
-      $this->nsp[$v] = $k;
-    }
-  }
-
-  /*  */
-  
-  function xgetPName($v) {/* moved to merged getPName in ARC2_CLass */
-    if (preg_match('/^([a-z0-9\_\-]+)\:([a-z\_][a-z0-9\_\-]*)$/i', $v, $m) && isset($this->ns[$m[1]])) {
-      $this->used_ns = !in_array($this->ns[$m[1]], $this->used_ns) ? array_merge($this->used_ns, array($this->ns[$m[1]])) : $this->used_ns;
-      return $v;
-    }
-    if (preg_match('/^(.*[\/\#])([a-z\_][a-z0-9\-\_]*)$/i', $v, $m)) {
-      return $this->getPrefix($m[1]) . ':' . $m[2];
-    }
-    return 0;
-  }
-  
-  /*  */
-  
-  function getSerializedTriples($triples, $raw = 0) {
-    $index = ARC2::getSimpleIndex($triples, 0);
-    return $this->getSerializedIndex($index, $raw);
-  }
-  
-  function getSerializedIndex($index, $raw = 0) {
-    return '';
-  }
-  
-  /*  */
-  
-}
diff --git a/libraries/ARC2/serializers/ARC2_RDFXMLSerializer.php b/libraries/ARC2/serializers/ARC2_RDFXMLSerializer.php
deleted file mode 100644
index 607d12bd6..000000000
--- a/libraries/ARC2/serializers/ARC2_RDFXMLSerializer.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * ARC2 RDF/XML Serializer
- *
- * @author    Benjamin Nowack
- * @license   <http://arc.semsol.org/license>
- * @homepage  <http://arc.semsol.org/>
- * @package   ARC2
- * @version   2010-10-25
-*/
-
-ARC2::inc('RDFSerializer');
-
-class ARC2_RDFXMLSerializer extends ARC2_RDFSerializer {
-
-  function __construct($a, &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'application/rdf+xml';
-    $this->pp_containers = $this->v('serializer_prettyprint_containers', 0, $this->a);
-    $this->default_ns = $this->v('serializer_default_ns', '', $this->a);
-    $this->type_nodes = $this->v('serializer_type_nodes', 0, $this->a);
-  }
-
-  /*  */
-  
-  function getTerm($v, $type) {
-    if (!is_array($v)) {/* uri or bnode */
-      if (preg_match('/^\_\:(.*)$/', $v, $m)) {
-        return ' rdf:nodeID="' . $m[1] . '"';
-      }
-      if ($type == 's') {
-        return ' rdf:about="' . htmlspecialchars($v) . '"';
-      }
-      if ($type == 'p') {
-        $pn = $this->getPName($v);
-        return $pn ? $pn : 0;
-      }
-      if ($type == 'o') {
-        $v = $this->expandPName($v);
-        if (!preg_match('/^[a-z0-9]{2,}\:[^\s]+$/is', $v)) return $this->getTerm(array('value' => $v, 'type' => 'literal'), $type);
-        return ' rdf:resource="' . htmlspecialchars($v) . '"';
-      }
-      if ($type == 'datatype') {
-        $v = $this->expandPName($v);
-        return ' rdf:datatype="' . htmlspecialchars($v) . '"';
-      }
-      if ($type == 'lang') {
-        return ' xml:lang="' . htmlspecialchars($v) . '"';
-      }
-    }
-    if ($this->v('type', '', $v) != 'literal') {
-      return $this->getTerm($v['value'], 'o');
-    }
-    /* literal */
-    $dt = isset($v['datatype']) ? $v['datatype'] : '';
-    $lang = isset($v['lang']) ? $v['lang'] : '';
-    if ($dt == 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral') {
-      return ' rdf:parseType="Literal">' . $v['value'];
-    }
-    elseif ($dt) {
-      return $this->getTerm($dt, 'datatype') . '>' . htmlspecialchars($v['value']);
-    }
-    elseif ($lang) {
-      return $this->getTerm($lang, 'lang') . '>' . htmlspecialchars($v['value']);
-    }
-    return '>' . htmlspecialchars($this->v('value', '', $v));
-  }
-
-  function getPName($v, $connector = ':') {
-    if ($this->default_ns && (strpos($v, $this->default_ns) === 0)) {
-      $pname = substr($v, strlen($this->default_ns));
-      if (!preg_match('/\//', $pname)) return $pname;
-    }
-    return parent::getPName($v, $connector);
-  }
-  
-  function getHead() {
-    $r = '';
-    $nl = "\n";
-    $r .= '<?xml version="1.0" encoding="UTF-8"?>';
-    $r .= $nl . '<rdf:RDF';
-    $first_ns = 1;
-    foreach ($this->used_ns as $v) {
-      $r .= $first_ns ? ' ' : $nl . '  ';
-      foreach ($this->ns as $prefix => $ns) {
-        if ($ns != $v) continue;
-        $r .= 'xmlns:' . $prefix . '="' .$v. '"';
-        break;
-      }
-      $first_ns = 0;
-    }
-    if ($this->default_ns) {
-      $r .= $first_ns ? ' ' : $nl . '  ';
-      $r .= 'xmlns="' . $this->default_ns . '"';
-    }
-    $r .= '>';
-    return $r;
-  }
-  
-  function getFooter() {
-    $r = '';
-    $nl = "\n";
-    $r .= $nl . $nl . '</rdf:RDF>';
-    return $r;
-  }
-  
-  function getSerializedIndex($index, $raw = 0) {
-    $r = '';
-    $nl = "\n";
-    foreach ($index as $raw_s => $ps) {
-      $r .= $r ? $nl . $nl : '';
-      $s = $this->getTerm($raw_s, 's');
-      $tag = 'rdf:Description';
-      list($tag, $ps) = $this->getNodeTag($ps);
-      $sub_ps = 0;
-      /* pretty containers */
-      if ($this->pp_containers && ($ctag = $this->getContainerTag($ps))) {
-        $tag = 'rdf:' . $ctag;
-        list($ps, $sub_ps) = $this->splitContainerEntries($ps);
-      }
-      $r .= '  <' . $tag . '' .$s . '>';
-      $first_p = 1;
-      foreach ($ps as $p => $os) {
-        if (!$os) continue;
-        $p = $this->getTerm($p, 'p');
-        if ($p) {
-          $r .= $nl . str_pad('', 4);
-          $first_o = 1;
-          if (!is_array($os)) {/* single literal o */
-            $os = array(array('value' => $os, 'type' => 'literal'));
-          }
-          foreach ($os as $o) {
-            $o = $this->getTerm($o, 'o');
-            $r .= $first_o ? '' : $nl . '    ';
-            $r .= '<' . $p;
-            $r .= $o;
-            $r .= preg_match('/\>/', $o) ? '</' . $p . '>' : '/>'; 
-            $first_o = 0;
-          }
-          $first_p = 0;
-        }
-      }
-      $r .= $r ? $nl . '  </' . $tag . '>' : '';
-      if ($sub_ps) $r .= $nl . $nl . $this->getSerializedIndex(array($raw_s => $sub_ps), 1);
-    }
-    if ($raw) {
-      return $r;
-    }
-    return $this->getHead() . $nl . $nl . $r . $this->getFooter();
-  }
-
-  function getNodeTag($ps) {
-    if (!$this->type_nodes) return array('rdf:Description', $ps);
-    $rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $types = $this->v($rdf . 'type', array(), $ps);
-    if (!$types) return array('rdf:Description', $ps);
-    $type = array_shift($types);
-    $ps[$rdf . 'type'] = $types;
-    if (!is_array($type)) $type = array('value' => $type);
-    return array($this->getPName($type['value']), $ps);
-  }
-
-  /*  */
-
-  function getContainerTag($ps) {
-    $rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    if (!isset($ps[$rdf . 'type'])) return '';
-    $types = $ps[$rdf . 'type'];
-    foreach ($types as $type) {
-      if (!in_array($type['value'], array($rdf . 'Bag', $rdf . 'Seq', $rdf . 'Alt'))) return '';
-      return str_replace($rdf, '', $type['value']);
-    }
-  }
-
-  function splitContainerEntries($ps) {
-    $rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    $items = array();
-    $rest = array();
-    foreach ($ps as $p => $os) {
-      $p_short = str_replace($rdf, '', $p);
-      if ($p_short === 'type') continue;
-      if (preg_match('/^\_([0-9]+)$/', $p_short, $m)) {
-        $items = array_merge($items, $os);
-      }
-      else {
-        $rest[$p] = $os;
-      }
-    }
-    if ($items) return array(array($rdf . 'li' => $items), $rest);
-    return array($rest, 0);
-  }
-
-  /*  */
-}
diff --git a/libraries/ARC2/serializers/ARC2_RSS10Serializer.php b/libraries/ARC2/serializers/ARC2_RSS10Serializer.php
deleted file mode 100644
index aeda454be..000000000
--- a/libraries/ARC2/serializers/ARC2_RSS10Serializer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * ARC2 RSS 1.0 Serializer
- *
- * @author Toby Inkster
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2009-11-09
-*/
-
-ARC2::inc('RDFXMLSerializer');
-
-class ARC2_RSS10Serializer extends ARC2_RDFXMLSerializer {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'application/rss+xml';
-    $this->default_ns = 'http://purl.org/rss/1.0/';
-    $this->type_nodes = true;
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/serializers/ARC2_TurtleSerializer.php b/libraries/ARC2/serializers/ARC2_TurtleSerializer.php
deleted file mode 100644
index 7f15fee7b..000000000
--- a/libraries/ARC2/serializers/ARC2_TurtleSerializer.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * ARC2 Turtle Serializer
- *
- * @author    Benjamin Nowack
- * @license   http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package   ARC2
- * @version   2010-08-11
- *
-*/
-
-ARC2::inc('RDFSerializer');
-
-class ARC2_TurtleSerializer extends ARC2_RDFSerializer {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->content_header = 'application/x-turtle';
-  }
-
-  /*  */
-  
-  function getTerm($v, $term = '', $qualifier = '') {
-    if (!is_array($v)) {
-      if (preg_match('/^\_\:/', $v)) {
-        return $v;
-      }
-      if (($term === 'p') && ($pn = $this->getPName($v))) {
-        return $pn;
-      }
-      if (
-        ($term === 'o') &&
-        in_array($qualifier, array('rdf:type', 'rdfs:domain', 'rdfs:range', 'rdfs:subClassOf')) &&
-        ($pn = $this->getPName($v))
-      ) {
-        return $pn;
-      }
-      if (preg_match('/^[a-z0-9]+\:[^\s]*$/is', $v)) {
-        return '<' .$v. '>';
-      }
-      return $this->getTerm(array('type' => 'literal', 'value' => $v), $term, $qualifier);
-    }
-    if (!isset($v['type']) || ($v['type'] != 'literal')) {
-      return $this->getTerm($v['value'], $term, $qualifier);
-    }
-    /* literal */
-    $quot = '"';
-    if (preg_match('/\"/', $v['value'])) {
-      $quot = "'";
-      if (preg_match('/\'/', $v['value']) || preg_match('/[\x0d\x0a]/', $v['value'])) {
-        $quot = '"""';
-        if (preg_match('/\"\"\"/', $v['value']) || preg_match('/\"$/', $v['value']) || preg_match('/^\"/', $v['value'])) {
-          $quot = "'''";
-          $v['value'] = preg_replace("/'$/", "' ", $v['value']);
-          $v['value'] = preg_replace("/^'/", " '", $v['value']);
-          $v['value'] = str_replace("'''", '\\\'\\\'\\\'', $v['value']);
-        }
-      }
-    }
-    if ((strlen($quot) == 1) && preg_match('/[\x0d\x0a]/', $v['value'])) {
-      $quot = $quot . $quot . $quot;
-    }
-    $suffix = isset($v['lang']) && $v['lang'] ? '@' . $v['lang'] : '';
-    $suffix = isset($v['datatype']) && $v['datatype'] ? '^^' . $this->getTerm($v['datatype'], 'dt') : $suffix;
-    return $quot . $v['value'] . $quot . $suffix;
-  }
-  
-  function getHead() {
-    $r = '';
-    $nl = "\n";
-    foreach ($this->used_ns as $v) {
-      $r .= $r ? $nl : '';
-      foreach ($this->ns as $prefix => $ns) {
-        if ($ns != $v) continue;
-        $r .= '@prefix ' . $prefix . ': <' .$v. '> .';
-        break;
-      }
-    }
-    return $r;
-  }
-  
-  function getSerializedIndex($index, $raw = 0) {
-    $r = '';
-    $nl = "\n";
-    foreach ($index as $s => $ps) {
-      $r .= $r ? ' .' . $nl . $nl : '';
-      $s = $this->getTerm($s, 's');
-      $r .= $s;
-      $first_p = 1;
-      foreach ($ps as $p => $os) {
-        if (!$os) continue;
-        $p = $this->getTerm($p, 'p');
-        $r .= $first_p ? ' ' : ' ;' . $nl . str_pad('', strlen($s) + 1);
-        $r .= $p;
-        $first_o = 1;
-        if (!is_array($os)) {/* single literal o */
-          $os = array(array('value' => $os, 'type' => 'literal'));
-        }
-        foreach ($os as $o) {
-          $r .= $first_o ? ' ' : ' ,' . $nl . str_pad('', strlen($s) + strlen($p) + 2);
-          $o = $this->getTerm($o, 'o', $p);
-          $r .= $o;
-          $first_o = 0;
-        }
-        $first_p = 0;
-      }
-    }
-    $r .= $r ? ' .' : '';
-    if ($raw) {
-      return $r;
-    }
-    return $r ? $this->getHead() . $nl . $nl . $r : '';
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/sparqlscript/ARC2_SPARQLScriptParser.php b/libraries/ARC2/sparqlscript/ARC2_SPARQLScriptParser.php
deleted file mode 100644
index 4cb915d95..000000000
--- a/libraries/ARC2/sparqlscript/ARC2_SPARQLScriptParser.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 SPARQLScript Parser (SPARQL+ + functions)
-author:   Benjamin Nowack
-version:  2008-09-22 (Addition: support for FunctionCall) 
-*/
-
-ARC2::inc('ARC2_SPARQLPlusParser');
-
-class ARC2_SPARQLScriptParser extends ARC2_SPARQLPlusParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-
-  function parse($v, $src = '', $iso_fallback = 'ignore') {
-    $this->setDefaultPrefixes();
-    $this->base = $src ? $this->calcBase($src) : ARC2::getScriptURI();
-    $this->blocks = array();
-    $this->r = array('base' => '', 'vars' => array(), 'prefixes' => $this->prefixes);
-    do {
-      $proceed = 0;
-      if ((list($r, $v) = $this->xScriptBlock($v)) && $r) {
-        $this->blocks[] = $r;
-        $proceed = 1;
-      }
-      $this->unparsed_code = trim($v);
-    } while ($proceed);
-    if (trim($this->unparsed_code) && !$this->getErrors()) {
-      $rest = preg_replace('/[\x0a|\x0d]/i', ' ', substr($this->unparsed_code, 0, 30));
-      $msg = trim($rest) ? 'Could not properly handle "' . $rest . '"' : 'Syntax Error';
-      $this->addError($msg);
-    }
-  }
-  
-  function getScriptBlocks() {
-    return $this->v('blocks', array());
-  }
-
-  /*  */
-
-  function xScriptBlock($v) {
-    /* comment removal */  
-    while (preg_match('/^\s*(\#[^\xd\xa]*)(.*)$/si', $v, $m)) $v = $m[2];
-    /* BaseDecl */
-    if ((list($sub_r, $v) = $this->xBaseDecl($v)) && $sub_r) {
-      $this->base = $sub_r;
-    }
-    /* PrefixDecl */
-    while ((list($r, $v) = $this->xPrefixDecl($v)) && $r) {
-      $this->prefixes[$r['prefix']] = $r['uri'];
-    }
-    /* EndpointDecl */
-    if ((list($r, $v) = $this->xEndpointDecl($v)) && $r) {
-      return array($r, $v);
-    }
-    /* Return */
-    if ((list($r, $v) = $this->xReturn($v)) && $r) {
-      return array($r, $v);
-    }
-    /* Assignment */
-    if ((list($r, $v) = $this->xAssignment($v)) && $r) {
-      return array($r, $v);
-    }
-    /* IFBlock */
-    if ((list($r, $v) = $this->xIFBlock($v)) && $r) {
-      return array($r, $v);
-    }
-    /* FORBlock */
-    if ((list($r, $v) = $this->xFORBlock($v)) && $r) {
-      return array($r, $v);
-    }
-    /* String */
-    if ((list($r, $v) = $this->xString($v)) && $r) {
-      return array($r, $v);
-    }
-    /* FunctionCall */
-    if ((list($r, $v) = $this->xFunctionCall($v)) && $r) {
-      return array($r, ltrim($v, ';'));
-    }
-    /* Query */
-    $prev_r = $this->r;
-    $this->r = array('base' => '', 'vars' => array(), 'prefixes' => $this->prefixes);
-    if ((list($r, $rest) = $this->xQuery($v)) && $r) {
-      $q = $rest ? trim(substr($v, 0, -strlen($rest))) : trim($v);
-      $v = $rest;
-      $r = array_merge($this->r, array(
-        'type' => 'query',
-        'query_type' => $r['type'],
-        'query' => $q,
-        //'prefixes' => $this->prefixes,
-        'base' => $this->base,
-        //'infos' => $r
-      ));
-      return array($r, $v);
-    }
-    else {
-      $this->r = $prev_r;
-    }
-    return array(0, $v);
-  }
-
-  function xBlockSet($v) {
-    if (!$r = $this->x("\{", $v)) return array(0, $v);
-    $blocks = array();
-    $sub_v = $r[1];
-    while ((list($sub_r, $sub_v) = $this->xScriptBlock($sub_v)) && $sub_r) {
-      $blocks[] = $sub_r;
-    }
-    if (!$sub_r = $this->x("\}", $sub_v)) return array(0, $v);
-    $sub_v = $sub_r[1];
-    return array(array('type' => 'block_set', 'blocks' => $blocks), $sub_v);
-  }
-  
-  /* s2 */
-  
-  function xEndpointDecl($v) {
-    if ($r = $this->x("ENDPOINT\s+", $v)) {
-      if ((list($r, $sub_v) = $this->xIRI_REF($r[1])) && $r) {
-        $r = $this->calcURI($r, $this->base);
-        if ($sub_r = $this->x('\.', $sub_v)) {
-          $sub_v = $sub_r[1];
-        }
-        return array(
-          array('type' => 'endpoint_decl', 'endpoint' => $r),
-          $sub_v
-        );
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* s3 */
-  
-  function xAssignment($v) {
-    /* Var */
-    list($r, $sub_v) = $this->xVar($v);
-    if (!$r) return array(0, $v);
-    $var = $r;
-    /* := | = */
-    if (!$sub_r = $this->x("\:?\=", $sub_v)) return array(0, $v);
-    $sub_v = $sub_r[1];
-    /* try String */
-    list($r, $sub_v) = $this->xString($sub_v);
-    if ($r) return array(array('type' => 'assignment', 'var' => $var, 'sub_type' => 'string', 'string' => $r), ltrim($sub_v, '; '));
-    /* try VarMerge */
-    list($r, $sub_v) = $this->xVarMerge($sub_v);
-    if ($r) return array(array('type' => 'assignment', 'var' => $var, 'sub_type' => 'var_merge', 'var2' => $r[0], 'var3' => $r[1]), ltrim($sub_v, '; '));
-    /* try Var */
-    list($r, $sub_v) = $this->xVar($sub_v);
-    if ($r) return array(array('type' => 'assignment', 'var' => $var, 'sub_type' => 'var', 'var2' => $r), ltrim($sub_v, '; '));
-    /* try function */
-    list($r, $sub_v) = $this->xFunctionCall($sub_v);
-    if ($r) return array(array('type' => 'assignment', 'var' => $var, 'sub_type' => 'function_call', 'function_call' => $r), ltrim($sub_v, '; '));
-    /* try Placeholder */
-    list($r, $sub_v) = $this->xPlaceholder($sub_v);
-    if ($r) return array(array('type' => 'assignment', 'var' => $var, 'sub_type' => 'placeholder', 'placeholder' => $r), ltrim($sub_v, '; '));
-    /* try query */
-    $prev_r = $this->r;
-    $this->r = array('base' => '', 'vars' => array(), 'prefixes' => $this->prefixes);
-    list($r, $rest) = $this->xQuery($sub_v);
-    if (!$r) {
-      $this->r = $prev_r;
-      return array(0, $v);
-    }
-    else {
-      $q = $rest ? trim(substr($sub_v, 0, -strlen($rest))) : trim($sub_v);
-      return array(
-        array(
-          'type' => 'assignment', 
-          'var' => $var,
-          'sub_type' => 'query',
-          'query' => array_merge($this->r, array(
-            'type' => 'query',
-            'query_type' => $r['type'],
-            'query' => $q,
-            'base' => $this->base,
-          )),
-        ),
-        ltrim($rest, '; ')
-      );
-    }
-  }
-
-  function xReturn($v) {
-    if ($r = $this->x("return\s+", $v)) {
-      /* fake assignment which accepts same right-hand values */
-      $sub_v = '$__return_value__ := ' . $r[1];
-      if ((list($r, $sub_v) = $this->xAssignment($sub_v)) && $r) {
-        $r['type'] = 'return';
-        return array($r, $sub_v);
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* s4 'IF' BrackettedExpression '{' Script '}' ( 'ELSE' '{' Script '}')?  */
-  
-  function xIFBlock($v) {
-    if ($r = $this->x("IF\s*", $v)) {
-      if ((list($sub_r, $sub_v) = $this->xBrackettedExpression($r[1])) && $sub_r) {
-        $cond = $sub_r;
-        if ((list($sub_r, $sub_v) = $this->xBlockSet($sub_v)) && $sub_r) {
-          $blocks = $sub_r['blocks'];
-          /* else */
-          $else_blocks = array();
-          $rest = $sub_v;
-          if ($sub_r = $this->x("ELSE\s*", $sub_v)) {
-            if ((list($sub_r, $sub_v) = $this->xBlockSet($sub_r[1])) && $sub_r) {
-              $else_blocks = $sub_r['blocks'];
-            }
-            else {
-              $sub_v = $rest;
-            }
-          }
-          return array(
-            array(
-              'type' => 'ifblock',
-              'condition' => $cond,
-              'blocks' => $blocks,
-              'else_blocks' => $else_blocks,
-            ),
-            $sub_v
-          );
-        }
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* s5 'FOR' '(' Var 'IN' Var ')' '{' Script '}' */
-  
-  function xFORBlock($v) {
-    if ($r = $this->x("FOR\s*\(\s*[\$\?]([^\s]+)\s+IN\s+[\$\?]([^\s]+)\s*\)", $v)) {/* @@todo split into sub-patterns? */
-      $iterator = $r[1];
-      $set_var = $r[2];
-      $sub_v = $r[3];
-      if ((list($sub_r, $sub_v) = $this->xBlockSet($sub_v)) && $sub_r) {
-        return array(
-          array(
-            'type' => 'forblock',
-            'set' => $set_var,
-            'iterator' => $iterator,
-            'blocks' => $sub_r['blocks']
-          ),
-          $sub_v
-        );
-      }
-    }
-    return array(0, $v);
-  }
-  
-  /* s6 Var '+' Var */
-  
-  function xVarMerge($v) {
-    if ((list($sub_r, $sub_v) = $this->xVar($v)) && $sub_r) {
-      $var1 = $sub_r;
-      if ($sub_r = $this->x("\+", $sub_v)) {
-        $sub_v = $sub_r[1];
-        if ((list($sub_r, $sub_v) = $this->xVar($sub_v)) && $sub_r) {
-          return array(
-            array($var1, $sub_r),
-            $sub_v
-          );
-        }
-      }
-    }
-    return array(0, $v);
-  }
-  
-}  
diff --git a/libraries/ARC2/sparqlscript/ARC2_SPARQLScriptProcessor.php b/libraries/ARC2/sparqlscript/ARC2_SPARQLScriptProcessor.php
deleted file mode 100644
index 5c7ad545d..000000000
--- a/libraries/ARC2/sparqlscript/ARC2_SPARQLScriptProcessor.php
+++ /dev/null
@@ -1,592 +0,0 @@
-<?php
-/**
- * ARC2 SPARQLScript Processor
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @package ARC2
- * @version 2010-07-06
-*/
-
-ARC2::inc('Class');
-
-class ARC2_SPARQLScriptProcessor extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->max_operations = $this->v('sparqlscript_max_operations', 0, $this->a);
-    $this->max_queries = $this->v('sparqlscript_max_queries', 0, $this->a);
-    $this->return = 0;
-    $this->script_hash = '';
-    $this->env = array(
-      'endpoint' => '',
-      'vars' => array(),
-      'output' => '',
-      'operation_count' => 0,
-      'query_count' => 0,
-      'query_log' => array()
-    );
-  }
-  
-  function reset() {
-    $this->__init();
-  }
-
-  /*  */
-  
-  function processScript($s) {
-    $this->script_hash = abs(crc32($s));
-    $parser = $this->getParser();
-    $parser->parse($s);
-    $blocks = $parser->getScriptBlocks();
-    if ($parser->getErrors()) return 0;
-    foreach ($blocks as $block) {
-      $this->processBlock($block);
-      if ($this->return) return 0;
-      if ($this->getErrors()) return 0;
-    }
-  }
-
-  function getResult() {
-    if ($this->return) {
-      return $this->getVarValue('__return_value__');
-    }
-    else {
-      return $this->env['output'];
-    }
-  }
-
-  /*  */
-  
-  function getParser() {
-    ARC2::inc('SPARQLScriptParser');
-    return new ARC2_SPARQLScriptParser($this->a, $this);
-  }
-  
-  /*  */
-
-  function setVar($name, $val, $type = 'literal', $meta = '') {
-    /* types: literal, var, rows, bool, doc, http_response, undefined, ? */
-    $this->env['vars'][$name] = array(
-      'value_type' => $type,
-      'value' => $val,
-      'meta' => $meta ? $meta : array()
-    );
-  }
-
-  function getVar($name) {
-    return isset($this->env['vars'][$name]) ? $this->env['vars'][$name] : '';
-  }
-
-  function getVarValue($name) {
-    return ($v = $this->getVar($name)) ? (isset($v['value']) ? $v['value'] : $v ) : '';
-  }
-
-  /*  */
-
-  function replacePlaceholders($val, $context = '', $return_string = 1, $loop = 0) {
-    do {
-      $old_val = $val;
-      if (preg_match_all('/(\{(?:[^{}]+|(?R))*\})/', $val, $m)) {
-        foreach ($m[1] as $match) {
-          if (strpos($val, '$' . $match) === false) {/* just some container brackets, recurse */
-            $val = str_replace($match, '{' . $this->replacePlaceholders(substr($match, 1, -1), $context, $return_string, $loop + 1) . '}', $val);
-          }
-          else {
-            $ph = substr($match, 1, -1);
-            $sub_val = $this->getPlaceholderValue($ph);
-            if (is_array($sub_val)) {
-              $sub_val = $this->getArraySerialization($sub_val, $context);
-            }
-            $val = str_replace('${' . $ph . '}', $sub_val, $val);
-          }
-        }
-      }
-    } while (($old_val != $val) && ($loop < 10));
-    return $val;
-  }
-  
-  function getPlaceholderValue($ph) {
-    /* simple vars */
-    if (isset($this->env['vars'][$ph])) {
-      return $this->v('value', $this->env['vars'][$ph], $this->env['vars'][$ph]);
-    }
-    /* GET/POST */
-    if (preg_match('/^(GET|POST)\.([^\.]+)(.*)$/', $ph, $m)) {
-      $vals = strtoupper($m[1]) == 'GET' ? $_GET : $POST;
-      $r = isset($vals[$m[2]]) ? $vals[$m[2]] : '';
-      return $m[3] ? $this->getPropertyValue(array('value' => $r, 'value_type' => '?'), ltrim($m[3], '.')) : $r;
-    }
-    /* NOW */
-    if (preg_match('/^NOW(.*)$/', $ph, $m)) {
-      $rest = $m[1];
-      /* may have sub-phs */
-      $rest = $this->replacePlaceholders($rest);
-      $r_struct = array(
-        'y' => date('Y'),
-        'mo' => date('m'),
-        'd' => date('d'),
-        'h' => date('H'),
-        'mi' => date('i'),
-        's' => date('s')
-      );
-      if (preg_match('/(\+|\-)\s*([0-9]+)(y|mo|d|h|mi|s)[a-z]*(.*)/is', trim($rest), $m2)) {
-        eval('$r_struct[$m2[3]] ' . $m2[1] . '= (int)' . $m2[2] . ';');
-        $rest = $m2[4];
-      }
-      $uts = mktime($r_struct['h'], $r_struct['mi'], $r_struct['s'], $r_struct['mo'], $r_struct['d'], $r_struct['y']);
-      $uts -= date('Z', $uts); /* timezone offset */
-      $r = date('Y-m-d\TH:i:s\Z', $uts);
-      if (preg_match('/^\.(.+)$/', $rest, $m)) {
-        return $this->getPropertyValue(array('value' => $r), $m[1]);
-      }
-      return $r;
-    }
-    /* property */
-    if (preg_match('/^([^\.]+)\.(.+)$/', $ph, $m)) {
-      list($var, $path) = array($m[1], $m[2]);
-      if (isset($this->env['vars'][$var])) {
-        return $this->getPropertyValue($this->env['vars'][$var], $path);
-      }
-    }
-    return '';
-  }
-  
-  function getPropertyValue($obj, $path) {
-    $val = isset($obj['value']) ? $obj['value'] : $obj;
-    $path = $this->replacePlaceholders($path, 'property_value', 0);
-    /* reserved */
-    if ($path == 'size') {
-      if ($obj['value_type'] == 'rows') return count($val);
-      if ($obj['value_type'] == 'literal') return strlen($val);
-    }
-    if (preg_match('/^replace\([\'\"](\/.*\/[a-z]*)[\'\"],\s*[\'\"](.*)[\'\"]\)$/is', $path, $m)) {
-      return @preg_replace($m[1], str_replace('$', '\\', $m[2]), $val);
-    }
-    if (preg_match('/^match\([\'\"](\/.*\/[a-z]*)[\'\"]\)$/is', $path, $m)) {
-      return @preg_match($m[1], $val, $m) ? $m : '';
-    }
-    if (preg_match('/^urlencode\([\'\"]?(get|post|.*)[\'\"]?\)$/is', $path, $m)) {
-      return (strtolower($m[1]) == 'post') ? rawurlencode($val) : urlencode($val);
-    }
-    if (preg_match('/^toDataURI\([^\)]*\)$/is', $path, $m)) {
-      return 'data:text/plain;charset=utf-8,' . rawurlencode($val);
-    }
-    if (preg_match('/^fromDataURI\([^\)]*\)$/is', $path, $m)) {
-      return rawurldecode(str_replace('data:text/plain;charset=utf-8,', '', $val));
-    }
-    if (preg_match('/^toPrettyDate\([^\)]*\)$/is', $path, $m)) {
-      $uts = strtotime(preg_replace('/(T|\+00\:00)/', ' ', $val));
-      return date('D j M H:i', $uts);
-    }
-    if (preg_match('/^render\(([^\)]*)\)$/is', $path, $m)) {
-      $src_format = trim($m[1], '"\'');
-      return $this->render($val, $src_format);
-    }
-    /* struct */
-    if (is_array($val)) {
-      if (isset($val[$path])) return $val[$path];
-      $exp_path = $this->expandPName($path);
-      if (isset($val[$exp_path])) return $val[$exp_path];
-      if (preg_match('/^([^\.]+)\.(.+)$/', $path, $m)) {
-        list($var, $path) = array($m[1], $m[2]);
-        if (isset($val[$var])) {
-          return $this->getPropertyValue(array('value' => $val[$var]), $path);
-        }
-        /* qname */
-        $exp_var = $this->expandPName($var);
-        if (isset($val[$exp_var])) {
-          return $this->getPropertyValue(array('value' => $val[$exp_var]), $path);
-        }
-        return '';
-      }
-    }
-    /* meta */
-    if (preg_match('/^\_/', $path) && isset($obj['meta']) && isset($obj['meta'][substr($path, 1)])) {
-      return $obj['meta'][substr($path, 1)];
-    }
-    return '';
-  }
-
-  function render($val, $src_format = '') {
-    if ($src_format) {
-      $mthd = 'render' . $this->camelCase($src_format);
-      if (method_exists($this, $mthd)) {
-        return $this->$mthd($val);
-      }
-      else {
-        return 'No rendering method found for "' . $src_format. '"';
-      }
-    }
-    /* try RDF */
-    return $this->getArraySerialization($val);
-  }
-  
-  function renderObjects($os) {
-    $r = '';
-    foreach ($os as $o) {
-      $r .= $r ? ', ' : '';
-      $r .= $o['value'];
-    }
-    return $r;
-  }
-
-  /*  */
-  
-  function getArraySerialization($v, $context) {
-    $v_type = ARC2::getStructType($v);/* string|array|triples|index */
-    $pf = ARC2::getPreferredFormat();
-    /* string */
-    if ($v_type == 'string') return $v;
-    /* simple array (e.g. from SELECT) */
-    if ($v_type == 'array') {
-      return join(', ', $v);
-      $m = method_exists($this, 'toLegacy' . $pf) ? 'toLegacy' . $pf : 'toLegacyXML';
-    }
-    /* rdf */
-    if (($v_type == 'triples') || ($v_type == 'index')) {
-      $m = method_exists($this, 'to' . $pf) ? 'to' . $pf : ($context == 'query' ? 'toNTriples' : 'toRDFXML');
-    }
-    /* else */
-    return $this->$m($v);
-  }
-
-  /*  */
-
-  function processBlock($block) {
-    if ($this->max_operations && ($this->env['operation_count'] >= $this->max_operations)) return $this->addError('Number of ' . $this->max_operations . ' allowed operations exceeded.');
-    if ($this->return) return 0;
-    $this->env['operation_count']++;
-    $type = $block['type'];
-    $m = 'process' . $this->camelCase($type) . 'Block';
-    if (method_exists($this, $m)) {
-      return $this->$m($block);
-    }
-    return $this->addError('Unsupported block type "' . $type . '"');
-  }
-
-  /*  */
-  
-  function processEndpointDeclBlock($block) {
-    $this->env['endpoint'] = $block['endpoint'];
-    return $this->env;
-  }
-
-  /*  */
-
-  function processQueryBlock($block) {
-    if ($this->max_queries && ($this->env['query_count'] >= $this->max_queries)) return $this->addError('Number of ' . $this->max_queries . ' allowed queries exceeded.');
-    $this->env['query_count']++;
-    $ep_uri = $this->replacePlaceholders($this->env['endpoint'], 'endpoint');
-    /* q */
-    $prologue = 'BASE <' . $block['base']. '>';
-    $q = $this->replacePlaceholders($block['query'], 'query');
-    /* prefixes */
-    $ns = isset($this->a['ns']) ? array_merge($this->a['ns'], $block['prefixes']) : $block['prefixes'];
-    $q = $prologue . "\n" . $this->completeQuery($q, $ns);
-    $this->env['query_log'][] = '(' . $ep_uri . ') ' . $q;
-    if ($store = $this->getStore($ep_uri)) {
-      $sub_r = $this->v('is_remote', '', $store) ? $store->query($q, '', $ep_uri) : $store->query($q);
-      /* ignore socket errors */
-      if (($errs = $this->getErrors()) && preg_match('/socket/', $errs[0])) {
-        $this->warnings[] = $errs[0];
-        $this->errors = array();
-        $sub_r = array();
-      }
-      return $sub_r;
-    }
-    else {
-      return $this->addError("no store (" . $ep_uri . ")");
-    }
-  }
-  
-  function getStore($ep_uri) {
-    /* local store */
-    if ((!$ep_uri || $ep_uri == ARC2::getScriptURI()) && ($this->v('sparqlscript_default_endpoint', '', $this->a) == 'local')) {
-      if (!isset($this->local_store)) $this->local_store = ARC2::getStore($this->a);/* @@todo error checking */
-      return $this->local_store;
-    }
-    elseif ($ep_uri) {
-      ARC2::inc('RemoteStore');
-      $conf = array_merge($this->a, array('remote_store_endpoint' => $ep_uri, 'reader_timeout' => 10));
-      return new ARC2_RemoteStore($conf, $this);
-    }
-    return 0;
-  }
-
-  /*  */
-
-  function processAssignmentBlock($block) {
-    $sub_type = $block['sub_type'];
-    $m = 'process' . $this->camelCase($sub_type) . 'AssignmentBlock';
-    if (!method_exists($this, $m)) return $this->addError('Unknown method "' . $m . '"');
-    return $this->$m($block);
-  }
-
-  function processQueryAssignmentBlock($block) {
-    $qr = $this->processQueryBlock($block['query']);
-    if ($this->getErrors() || !isset($qr['query_type'])) return 0;
-    $qt = $qr['query_type'];
-    $vts = array('ask' => 'bool', 'select' => 'rows', 'desribe' => 'doc', 'construct' => 'doc');
-    $r = array(
-      'value_type' => isset($vts[$qt]) ? $vts[$qt] : $qt . ' result',
-      'value' => ($qt == 'select') ? $this->v('rows', array(), $qr['result']) : $qr['result'],
-    );
-    $this->env['vars'][$block['var']['value']] = $r;
-  }
-  
-  function processStringAssignmentBlock($block) {
-    $r = array('value_type' => 'literal', 'value' => $this->replacePlaceholders($block['string']['value']));
-    $this->env['vars'][$block['var']['value']] = $r;
-  }
-  
-  function processVarAssignmentBlock($block) {
-    if (isset($this->env['vars'][$block['var2']['value']])) {
-      $this->env['vars'][$block['var']['value']] = $this->env['vars'][$block['var2']['value']];
-    }
-    else {
-      $this->env['vars'][$block['var']['value']] = array('value_type' => 'undefined', 'value' => '');
-    }
-  }
-  
-  function processPlaceholderAssignmentBlock($block) {
-    $ph_val = $this->getPlaceholderValue($block['placeholder']['value']);
-    $this->env['vars'][$block['var']['value']] = array('value_type' => 'undefined', 'value' => $ph_val);
-  }
-  
-  function processVarMergeAssignmentBlock($block) {
-    $val1 = isset($this->env['vars'][$block['var2']['value']]) ? $this->env['vars'][$block['var2']['value']] : array('value_type' => 'undefined', 'value' => '');
-    $val2 = isset($this->env['vars'][$block['var3']['value']]) ? $this->env['vars'][$block['var3']['value']] : array('value_type' => 'undefined', 'value' => '');
-    if (is_array($val1) && is_array($val2)) {
-      $this->env['vars'][$block['var']['value']] = array('value_type' => $val2['value_type'], 'value' => array_merge($val1['value'], $val2['value']));
-    }
-    elseif (is_numeric($val1) && is_numeric($val2)) {
-      $this->env['vars'][$block['var']['value']] = $val1 + $val2;
-    }
-  }
-  
-  function processFunctionCallAssignmentBlock($block) {
-    $sub_r = $this->processFunctionCallBlock($block['function_call']);
-    if ($this->getErrors()) return 0;
-    $this->env['vars'][$block['var']['value']] = $sub_r;
-  }
-
-  /*  */
-
-  function processReturnBlock($block) {
-    $sub_type = $block['sub_type'];
-    $m = 'process' . $this->camelCase($sub_type) . 'AssignmentBlock';
-    if (!method_exists($this, $m)) return $this->addError('Unknown method "' . $m . '"');
-    $sub_r = $this->$m($block);
-    $this->return = 1;
-    return $sub_r;
-  }
-
-  /*  */
-  
-  function processIfblockBlock($block) {
-    if ($this->testCondition($block['condition'])) {
-      $blocks = $block['blocks'];
-    }
-    else {
-      $blocks = $block['else_blocks'];
-    }
-    foreach ($blocks as $block) {
-      $sub_r = $this->processBlock($block);
-      if ($this->getErrors()) return 0;
-    }
-  }
-  
-  function testCondition($cond) {
-    $m = 'test' . $this->camelCase($cond['type']) . 'Condition';
-    if (!method_exists($this, $m)) return $this->addError('Unknown method "' . $m . '"');
-    return $this->$m($cond);
-  }
-
-  function testVarCondition($cond) {
-    $r = 0;
-    $vn = $cond['value'];
-    if (isset($this->env['vars'][$vn])) $r = $this->env['vars'][$vn]['value'];
-    $op = $this->v('operator', '', $cond);
-    if ($op == '!') $r = !$r;
-    return $r ? true : false;
-  }
-  
-  function testPlaceholderCondition($cond) {
-    $val = $this->getPlaceholderValue($cond['value']);
-    $r = $val ? true : false;
-    $op = $this->v('operator', '', $cond);
-    if ($op == '!') $r = !$r;
-    return $r;
-  }
-  
-  function testExpressionCondition($cond) {
-    $m = 'test' . $this->camelCase($cond['sub_type']) . 'ExpressionCondition';
-    if (!method_exists($this, $m)) return $this->addError('Unknown method "' . $m . '"');
-    return $this->$m($cond);
-  }
-  
-  function testRelationalExpressionCondition($cond) {
-    $op = $cond['operator'];
-    if ($op == '=') $op = '==';
-    $val1 = $this->getPatternValue($cond['patterns'][0]);
-    $val2 = $this->getPatternValue($cond['patterns'][1]);
-    eval('$result = ($val1 ' . $op . ' $val2) ? 1 : 0;');
-    return $result;
-  }
-
-  function testAndExpressionCondition($cond) {
-    foreach ($cond['patterns'] as $pattern) {
-      if (!$this->testCondition($pattern)) return false;
-    }
-    return true;
-  }
-
-  function getPatternValue($pattern) {
-    $m = 'get' . $this->camelCase($pattern['type']) . 'PatternValue';
-    if (!method_exists($this, $m)) return '';
-    return $this->$m($pattern);
-  }
-
-  function getLiteralPatternValue($pattern) {
-    return $pattern['value'];
-  }
-  
-  function getPlaceholderPatternValue($pattern) {
-    return $this->getPlaceholderValue($pattern['value']);
-  }
-  
-  /*  */
-  
-  function processForblockBlock($block) {
-    $set = $this->v($block['set'], array('value' => array()), $this->env['vars']);
-    $entries = isset($set['value']) ? $set['value'] : $set;
-    $iterator = $block['iterator'];
-    $blocks = $block['blocks'];
-    if (!is_array($entries)) return 0;
-    $rc = count($entries);
-    foreach ($entries as $i => $entry) {
-      $val_type = $this->v('value_type', 'set', $set) . ' entry';
-      $this->env['vars'][$iterator] = array(
-        'value' => $entry,
-        'value_type' => $val_type,
-        'meta' => array(
-          'pos' => $i,
-          'odd_even' => ($i % 2) ? 'even' : 'odd'
-        )
-      );
-      foreach ($blocks as $block) {
-        $this->processBlock($block);
-        if ($this->getErrors()) return 0;
-      }
-    }
-  }
-  
-  /*  */
-
-  function processLiteralBlock($block) {
-    $this->env['output'] .= $this->replacePlaceholders($block['value'], 'output');
-  }
-
-  /*  */
-  
-  function processFunctionCallBlock($block) {
-    $uri = $this->replacePlaceholders($block['uri'], 'function_call');
-    /* built-ins */
-    if (strpos($uri, $this->a['ns']['sps']) === 0) {
-      return $this->processBuiltinFunctionCallBlock($block);
-    }
-    /* remote functions */
-  }
-
-  function processBuiltinFunctionCallBlock($block) {
-    $fnc_uri = $this->replacePlaceholders($block['uri'], 'function_call');
-    $fnc_name = substr($fnc_uri, strlen($this->a['ns']['sps']));
-    if (preg_match('/^(get|post)$/i', $fnc_name, $m)) {
-      return $this->processHTTPCall($block, strtoupper($m[1]));
-    }
-    if ($fnc_name == 'eval') {
-      return $this->processEvalCall($block);
-    }
-  }
-
-  function processEvalCall($block) {
-    if (!$block['args']) return 0;
-    $arg = $block['args'][0];
-    $script = '';
-    if ($arg['type'] == 'placeholder') $script = $this->getPlaceholderValue($arg['value']);
-    if ($arg['type'] == 'literal') $script = $arg['value'];
-    if ($arg['type'] == 'var') $script = $this->getVarValue($arg['value']);
-    //echo "\n" . $script . $arg['type'];
-    $this->processScript($script);
-  }
-  
-  function processHTTPCall($block, $mthd = 'GET') {
-    ARC2::inc('Reader');
-    $reader = new ARC2_Reader($this->a, $this);
-    $url = $this->replacePlaceholders($block['args'][0]['value'], 'function_call');
-    if ($mthd != 'GET') {
-      $reader->setHTTPMethod($mthd);
-      $reader->setCustomHeaders("Content-Type: application/x-www-form-urlencoded");
-    }
-    $to = $this->v('remote_call_timeout', 0, $this->a);
-    $reader->activate($url, '', 0, $to);
-    $format = $reader->getFormat();
-    $resp = '';
-    while ($d = $reader->readStream()) {
-      $resp .= $d;
-    }
-    $reader->closeStream();
-    unset($this->reader);
-    return array('value_type' => 'http_response', 'value' => $resp);
-  }
-  
-  /*  */
-  
-  function extractVars($pattern, $input = '') {
-    $vars = array();
-    /* replace PHs, track ()s */
-    $regex = $pattern;
-    $vars = array();
-    if (preg_match_all('/([\?\$]\{([^\}]+)\}|\([^\)]+\))/', $regex, $m)) {
-      $matches = $m[1];
-      $pre_vars = $m[2];
-      foreach ($matches as $i => $match) {
-        $vars[] = $pre_vars[$i];
-        if ($pre_vars[$i]) {/* placeholder */
-          $regex = str_replace($match, '(.+)', $regex);
-        }
-        else {/* parentheses, but may contain placeholders */
-          $sub_regex = $match;
-          while (preg_match('/([\?\$]\{([^\}]+)\})/', $sub_regex, $m)) {
-            $sub_regex = str_replace($m[1], '(.+)', $sub_regex);
-            $vars[] = $m[2];
-          }
-          $regex = str_replace($match, $sub_regex, $regex);
-        }
-      }
-      /* eval regex */
-      if (@preg_match('/' . $regex . '/is', $input, $m)) {
-        $vals = $m;
-      }
-      else {
-        return 0;
-      }
-      for ($i = 0; $i < count($vars); $i++) {
-        if ($vars[$i]) {
-          $this->setVar($vars[$i], isset($vals[$i + 1]) ? $vals[$i + 1] : '');
-        }
-      }
-      return 1;
-    }
-    /* no placeholders */
-    return ($pattern == $input) ? 1 : 0;
-  }
-  
-  /*  */
-  
-}
\ No newline at end of file
diff --git a/libraries/ARC2/store/ARC2_RemoteStore.php b/libraries/ARC2/store/ARC2_RemoteStore.php
deleted file mode 100644
index 0e128dd44..000000000
--- a/libraries/ARC2/store/ARC2_RemoteStore.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * ARC2 Remote RDF Store
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @package ARC2
- * @version 2010-05-07
-*/
-
-ARC2::inc('Class');
-
-class ARC2_RemoteStore extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-    $this->is_remote = 1;
-  }
-
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-
-  function isSetUp() {
-    return 1;
-  }
-  
-  function setUp() {}
-  
-  function killDBProcesses() {}
-  
-  /*  */
-  
-  function reset() {}
-  
-  function drop() {}
-  
-  function insert($doc, $g, $keep_bnode_ids = 0) {
-    return $this->query('INSERT INTO <' . $g . '> { ' . $this->toNTriples($doc, '', 1) . ' }');
-  }
-  
-  function delete($doc, $g) {
-    if (!$doc) {
-      return $this->query('DELETE FROM <' . $g . '>');
-    }
-    else {
-      return $this->query('DELETE FROM <' . $g . '> { ' . $this->toNTriples($doc, '', 1) . ' }');
-    }
-  }
-  
-  function replace($doc, $g, $doc_2) {
-    return array($this->delete($doc, $g), $this->insert($doc_2, $g));
-  }
-  
-  /*  */
-  
-  function query($q, $result_format = '', $src = '', $keep_bnode_ids = 0, $log_query = 0) {
-    if ($log_query) $this->logQuery($q);
-    ARC2::inc('SPARQLPlusParser');
-    $p = new ARC2_SPARQLPlusParser($this->a, $this);
-    $p->parse($q, $src);
-    $infos = $p->getQueryInfos();
-    $t1 = ARC2::mtime();
-    if (!$errs = $p->getErrors()) {
-      $qt = $infos['query']['type'];
-      $r = array('query_type' => $qt, 'result' => $this->runQuery($q, $qt, $infos));
-    }
-    else {
-      $r = array('result' => '');
-    }
-    $t2 = ARC2::mtime();
-    $r['query_time'] = $t2 - $t1;
-    /* query result */
-    if ($result_format == 'raw') {
-      return $r['result'];
-    }
-    if ($result_format == 'rows') {
-      return $this->v('rows', array(), $r['result']);
-    }
-    if ($result_format == 'row') {
-      if (!isset($r['result']['rows'])) return array();
-      return $r['result']['rows'] ? $r['result']['rows'][0] : array();
-    }
-    return $r;
-  }
-
-  function runQuery($q, $qt = '', $infos = '') {
-    /* ep */
-    $ep = $this->v('remote_store_endpoint', 0, $this->a);
-    if (!$ep) return false;
-    /* prefixes */
-    $q = $this->completeQuery($q);
-    /* custom handling */
-    $mthd = 'run' . $this->camelCase($qt) . 'Query';
-    if (method_exists($this, $mthd)) {
-      return $this->$mthd($q, $infos);
-    }
-    /* http verb */
-    $mthd = in_array($qt, array('load', 'insert', 'delete')) ? 'POST' : 'GET';
-    /* reader */
-    ARC2::inc('Reader');
-    $reader = new ARC2_Reader($this->a, $this);
-    $reader->setAcceptHeader('Accept: application/sparql-results+xml; q=0.9, application/rdf+xml; q=0.9, */*; q=0.1');
-    if ($mthd == 'GET') {
-      $url = $ep;
-      $url .= strpos($ep, '?') ? '&' : '?';
-      $url .= 'query=' . urlencode($q);
-      if ($k = $this->v('store_read_key', '', $this->a)) $url .= '&key=' . urlencode($k);
-    }
-    else {
-      $url = $ep;
-      $reader->setHTTPMethod($mthd);
-      $reader->setCustomHeaders("Content-Type: application/x-www-form-urlencoded");
-      $suffix = ($k = $this->v('store_write_key', '', $this->a)) ? '&key=' . rawurlencode($k) : '';
-      $reader->setMessageBody('query=' . rawurlencode($q) . $suffix);
-    }
-    $to = $this->v('remote_store_timeout', 0, $this->a);
-    $reader->activate($url, '', 0, $to);
-    $format = $reader->getFormat();
-    $resp = '';
-    while ($d = $reader->readStream()) {
-      $resp .= $this->toUTF8($d);
-    }
-    $reader->closeStream();
-    $ers = $reader->getErrors();
-    $this->a['reader_auth_infos'] = $reader->getAuthInfos();
-    unset($this->reader);
-    if ($ers) return array('errors' => $ers);
-    $mappings = array('rdfxml' => 'RDFXML', 'sparqlxml' => 'SPARQLXMLResult', 'turtle' => 'Turtle');
-    if (!$format || !isset($mappings[$format])) {
-      return $resp;
-      //return $this->addError('No parser available for "' . $format . '" SPARQL result');
-    }
-    /* format parser */
-    $suffix = $mappings[$format] . 'Parser';
-    ARC2::inc($suffix);
-    $cls = 'ARC2_' . $suffix;
-    $parser = new $cls($this->a, $this);
-    $parser->parse($ep, $resp);
-    /* ask|load|insert|delete */
-    if (in_array($qt, array('ask', 'load', 'insert', 'delete'))) {
-      $bid = $parser->getBooleanInsertedDeleted();
-      if ($qt == 'ask') {
-        $r = $bid['boolean'];
-      }
-      else {
-        $r = $bid;
-      }
-    }
-    /* select */
-    elseif (($qt == 'select') && !method_exists($parser, 'getRows')) {
-      $r = $resp;
-    }
-    elseif ($qt == 'select') {
-      $r = array('rows' => $parser->getRows(), 'variables' => $parser->getVariables());
-    }
-    /* any other */
-    else {
-      $r = $parser->getSimpleIndex(0);
-    }
-    unset($parser);
-    return $r;
-  }
-  
-  /*  */
-  
-  function optimizeTables() {}
-  
-  /*  */
-
-  function getResourceLabel($res, $unnamed_label = 'An unnamed resource') {
-    if (!isset($this->resource_labels)) $this->resource_labels = array();
-    if (isset($this->resource_labels[$res])) return $this->resource_labels[$res];
-    if (!preg_match('/^[a-z0-9\_]+\:[^\s]+$/si', $res)) return $res;/* literal */
-    $r = '';
-    if (preg_match('/^\_\:/', $res)) {
-      return $unnamed_label;
-    }
-    $row = $this->query('SELECT ?o WHERE { <' . $res . '> ?p ?o . FILTER(REGEX(str(?p), "(label|name)$", "i"))}', 'row');
-    if ($row) {
-      $r = $row['o'];
-    }
-    else {
-      $r = preg_replace("/^(.*[\/\#])([^\/\#]+)$/", '\\2', str_replace('#self', '', $res));
-      $r = str_replace('_', ' ', $r);
-      $r = preg_replace('/([a-z])([A-Z])/e', '"\\1 " . strtolower("\\2")', $r);
-    }
-    $this->resource_labels[$res] = $r;
-    return $r;
-  }
-  
-  function getDomains($p) {
-    $r = array();
-    foreach($this->query('SELECT DISTINCT ?type WHERE {?s <' . $p . '> ?o ; a ?type . }', 'rows') as $row) {
-      $r[] = $row['type'];
-    }
-    return $r;
-  }
-
-  /*  */
-  
-}
diff --git a/libraries/ARC2/store/ARC2_Store.php b/libraries/ARC2/store/ARC2_Store.php
deleted file mode 100644
index 9b634f40c..000000000
--- a/libraries/ARC2/store/ARC2_Store.php
+++ /dev/null
@@ -1,670 +0,0 @@
-<?php
-/**
- * ARC2 RDF Store
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-22
-*/
-
-ARC2::inc('Class');
-
-class ARC2_Store extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->table_lock = 0;
-    $this->triggers = $this->v('store_triggers', array(), $this->a);
-    $this->queue_queries = $this->v('store_queue_queries', 0, $this->a);
-    $this->is_win = (strtolower(substr(PHP_OS, 0, 3)) == 'win') ? true : false;
-    $this->max_split_tables = $this->v('store_max_split_tables', 10, $this->a);
-    $this->split_predicates = $this->v('store_split_predicates', array(), $this->a);
-  }
-
-  /*  */
-  
-  function getName() {
-    return $this->v('store_name', 'arc', $this->a);
-  }
-
-  function getTablePrefix() {
-    if (!isset($this->tbl_prefix)) {
-      $r = $this->v('db_table_prefix', '', $this->a);
-      $r .= $r ? '_' : '';
-      $r .= $this->getName() . '_';
-      $this->tbl_prefix = $r;
-    }
-    return $this->tbl_prefix;;
-  }
-
-  /*  */
-  
-  function createDBCon() {
-    foreach (array('db_host' => 'localhost', 'db_user' => '', 'db_pwd' => '', 'db_name' => '') as $k => $v) {
-      $this->a[$k] = $this->v($k, $v, $this->a);
-    }
-    if (!$db_con = mysql_connect($this->a['db_host'], $this->a['db_user'], $this->a['db_pwd'])) {
-      return $this->addError(mysql_error());
-    }
-    $this->a['db_con'] = $db_con;
-    if (!mysql_select_db($this->a['db_name'], $db_con)) {
-      return $this->addError(mysql_error($db_con));
-    }
-    if (preg_match('/^utf8/', $this->getCollation())) {
-      $this->queryDB("SET NAMES 'utf8'", $db_con);
-    }
-    return true;
-  }
-  
-  function getDBCon($force = 0) {
-    if ($force || !isset($this->a['db_con'])) {
-      if (!$this->createDBCon()) {
-        return false;
-      }
-    }
-    if (!$force && !@mysql_thread_id($this->a['db_con'])) return $this->getDBCon(1);
-    return $this->a['db_con'];
-  }
-  
-  function closeDBCon() {
-    if ($this->v('db_con', false, $this->a)) {
-      @mysql_close($this->a['db_con']);
-    }
-    unset($this->a['db_con']);
-  }
-  
-  function getDBVersion() {
-    if (!$this->v('db_version')) {
-      $this->db_version = preg_match("/^([0-9]+)\.([0-9]+)\.([0-9]+)/", mysql_get_server_info($this->getDBCon()), $m) ? sprintf("%02d-%02d-%02d", $m[1], $m[2], $m[3])  : '00-00-00';
-    }
-    return $this->db_version;
-  }
-  
-  /*  */
-  
-  function getCollation() {
-    $rs = $this->queryDB('SHOW TABLE STATUS LIKE "' . $this->getTablePrefix(). 'setting"', $this->getDBCon());
-    return ($rs && ($row = mysql_fetch_array($rs)) && isset($row['Collation'])) ? $row['Collation'] : '';
-  }
-
-  function getColumnType() {
-    if (!$this->v('column_type')) {
-      $tbl = $this->getTablePrefix() . 'g2t';
-      $rs = $this->queryDB('SHOW COLUMNS FROM ' . $tbl . ' LIKE "t"', $this->getDBCon());
-      $row = $rs ? mysql_fetch_array($rs) : array('Type' => 'mediumint');
-      $this->column_type = preg_match('/mediumint/', $row['Type']) ? 'mediumint' : 'int';
-    }
-    return $this->column_type;
-  }
-
-  /*  */
-
-  function hasHashColumn($tbl) {
-    $var_name = 'has_hash_column_' . $tbl;
-    if (!isset($this->$var_name)) {
-      $tbl = $this->getTablePrefix() . $tbl;
-      $rs = $this->queryDB('SHOW COLUMNS FROM ' . $tbl . ' LIKE "val_hash"', $this->getDBCon());
-      $this->$var_name = ($rs && mysql_fetch_array($rs));
-    }
-    return $this->$var_name;
-  }
-
-  /*  */
-
-  function hasFulltextIndex() {
-    if (!isset($this->has_fulltext_index)) {
-      $this->has_fulltext_index = 0;
-      $tbl = $this->getTablePrefix() . 'o2val';
-      $rs = $this->queryDB('SHOW INDEX FROM ' . $tbl, $this->getDBCon());
-      while ($row = mysql_fetch_array($rs)) {
-        if ($row['Column_name'] != 'val') continue;
-        if ($row['Index_type'] != 'FULLTEXT') continue;
-        $this->has_fulltext_index = 1;
-        break;
-      }
-    }
-    return $this->has_fulltext_index;
-  }
-
-  function enableFulltextSearch() {
-    if ($this->hasFulltextIndex()) return 1;
-    $tbl = $this->getTablePrefix() . 'o2val';
-    $this->queryDB('CREATE FULLTEXT INDEX vft ON ' . $tbl . '(val(128))', $this->getDBCon(), 1);
-  }
-
-  function disableFulltextSearch() {
-    if (!$this->hasFulltextIndex()) return 1;
-    $tbl = $this->getTablePrefix() . 'o2val';
-    $this->queryDB('DROP INDEX vft ON ' . $tbl, $this->getDBCon());
-  }
-
-  /*  */
-
-  function countDBProcesses() {
-    return ($rs = $this->queryDB('SHOW PROCESSLIST', $this->getDBCon())) ? mysql_num_rows($rs) : 0;
-  }
-  
-  function killDBProcesses($needle = '', $runtime = 30) {
-    $dbcon = $this->getDBCon();
-    /* make sure needle is sql */
-    if (preg_match('/\?.+ WHERE/i', $needle, $m)) {
-      $needle = $this->query($needle, 'sql');
-    }
-    $rs = $this->queryDB('SHOW FULL PROCESSLIST', $dbcon);
-    $ref_tbl = $this->getTablePrefix() . 'triple';
-    while ($row = mysql_fetch_array($rs)) {
-      if ($row['Time'] < $runtime) continue;
-      if (!preg_match('/^\s*(INSERT|SELECT) /s', $row['Info'])) continue; /* only basic queries */
-      if (!strpos($row['Info'], $ref_tbl . ' ')) continue; /* only from this store */
-      $kill = 0;
-      if ($needle && (strpos($row['Info'], $needle) !== false)) $kill = 1;
-      if (!$needle) $kill = 1;
-      if (!$kill) continue;
-      $this->queryDB('KILL ' . $row['Id'], $dbcon);
-    }
-  }
-  
-  /*  */
-
-  function getTables() {
-    return array('triple', 'g2t', 'id2val', 's2val', 'o2val', 'setting');
-  }  
-  
-  /*  */
-
-  function isSetUp() {
-    if (($con = $this->getDBCon())) {
-      $tbl = $this->getTablePrefix() . 'setting';
-      return $this->queryDB("SELECT 1 FROM " . $tbl . " LIMIT 0", $con) ? 1 : 0;
-    }
-  }
-  
-  function setUp($force = 0) {
-    if (($force || !$this->isSetUp()) && ($con = $this->getDBCon())) {
-      if ($this->getDBVersion() < '04-00-04') {
-        /* UPDATE + JOINs */
-        return $this->addError('MySQL version not supported. ARC requires version 4.0.4 or higher.');
-      }
-      ARC2::inc('StoreTableManager');
-      $mgr = new ARC2_StoreTableManager($this->a, $this);
-      $mgr->createTables();
-    }
-  }
-
-  function extendColumns() {
-    ARC2::inc('StoreTableManager');
-    $mgr = new ARC2_StoreTableManager($this->a, $this);
-    $mgr->extendColumns();
-    $this->column_type = 'int';
-  }
-
-  function splitTables() {
-    ARC2::inc('StoreTableManager');
-    $mgr = new ARC2_StoreTableManager($this->a, $this);
-    $mgr->splitTables();
-  }
-  
-  /*  */
-  
-  function hasSetting($k) {
-    $tbl = $this->getTablePrefix() . 'setting';
-    $sql = "SELECT val FROM " . $tbl . " WHERE k = '" .md5($k). "'";
-    $rs = $this->queryDB($sql, $this->getDBCon());
-    return ($rs && ($row = mysql_fetch_array($rs))) ? 1 : 0;
-  }
-  
-  function getSetting($k, $default = 0) {
-    $tbl = $this->getTablePrefix() . 'setting';
-    $sql = "SELECT val FROM " . $tbl . " WHERE k = '" .md5($k). "'";
-    $rs = $this->queryDB($sql, $this->getDBCon());
-    if ($rs && ($row = mysql_fetch_array($rs))) {
-      return unserialize($row['val']);
-    }
-    return $default;
-  }
-  
-  function setSetting($k, $v) {
-    $con = $this->getDBCon();
-    $tbl = $this->getTablePrefix() . 'setting';
-    if ($this->hasSetting($k)) {
-      $sql = "UPDATE " .$tbl . " SET val = '" . mysql_real_escape_string(serialize($v), $con) . "' WHERE k = '" . md5($k) . "'";
-    }
-    else {
-      $sql = "INSERT INTO " . $tbl . " (k, val) VALUES ('" . md5($k) . "', '" . mysql_real_escape_string(serialize($v), $con) . "')";
-    }
-    return $this->queryDB($sql, $con);
-  }
-  
-  function removeSetting($k) {
-    $tbl = $this->getTablePrefix() . 'setting';
-    return $this->queryDB("DELETE FROM " . $tbl . " WHERE k = '" . md5($k) . "'", $this->getDBCon());
-  }
-  
-  function getQueueTicket() {
-    if (!$this->queue_queries) return 1;
-    $t = 'ticket_' . substr(md5(uniqid(rand())), 0, 10);
-    $con = $this->getDBCon();
-    /* lock */
-    $rs = $this->queryDB('LOCK TABLES ' . $this->getTablePrefix() . 'setting WRITE', $con);
-    /* queue */
-    $queue = $this->getSetting('query_queue', array());
-    $queue[] = $t;
-    $this->setSetting('query_queue', $queue);
-    $this->queryDB('UNLOCK TABLES', $con);
-    /* loop */
-    $lc = 0;
-    $queue = $this->getSetting('query_queue', array());
-    while ($queue && ($queue[0] != $t) && ($lc < 30)) {
-      if ($this->is_win) {
-        sleep(1);
-        $lc++;
-      }
-      else {
-         usleep(100000);
-         $lc += 0.1;
-      }
-      $queue = $this->getSetting('query_queue', array());
-    }
-    return ($lc < 30) ? $t : 0;
-  }
-  
-  function removeQueueTicket($t) {
-    if (!$this->queue_queries) return 1;
-    $con = $this->getDBCon();
-    /* lock */
-    $this->queryDB('LOCK TABLES ' . $this->getTablePrefix() . 'setting WRITE', $con);
-    /* queue */
-    $vals = $this->getSetting('query_queue', array());
-    $pos = array_search($t, $vals);
-    $queue = ($pos < (count($vals) - 1)) ? array_slice($vals, $pos + 1) : array();
-    $this->setSetting('query_queue', $queue);
-    $this->queryDB('UNLOCK TABLES', $con);
-  }
-  
-  /*  */
-
-  function reset($keep_settings = 0) {
-    $con = $this->getDBCon();
-    $tbls = $this->getTables();
-    $prefix = $this->getTablePrefix();
-    /* remove split tables */
-    $ps = $this->getSetting('split_predicates', array());
-    foreach ($ps as $p) {
-      $tbl = 'triple_' . abs(crc32($p));
-      $this->queryDB('DROP TABLE ' . $prefix . $tbl, $con);
-    }
-    $this->removeSetting('split_predicates');
-    /* truncate tables */
-    foreach ($tbls as $tbl) {
-      if ($keep_settings && ($tbl == 'setting')) {
-        continue;
-      }
-      $this->queryDB('TRUNCATE ' . $prefix . $tbl, $con);
-    }
-  }
-  
-  function drop() {
-    $con = $this->getDBCon();
-    $tbls = $this->getTables();
-    $prefix = $this->getTablePrefix();
-    foreach ($tbls as $tbl) {
-      $this->queryDB('DROP TABLE ' . $prefix . $tbl, $con);
-    }
-  }
-  
-  function insert($doc, $g, $keep_bnode_ids = 0) {
-    $doc = is_array($doc) ? $this->toTurtle($doc) : $doc;
-    $infos = array('query' => array('url' => $g, 'target_graph' => $g));
-    ARC2::inc('StoreLoadQueryHandler');
-    $h = new ARC2_StoreLoadQueryHandler($this->a, $this);
-    $r = $h->runQuery($infos, $doc, $keep_bnode_ids);
-    $this->processTriggers('insert', $infos);
-    return $r;
-  }
-  
-  function delete($doc, $g) {
-    if (!$doc) {
-      $infos = array('query' => array('target_graphs' => array($g)));
-      ARC2::inc('StoreDeleteQueryHandler');
-      $h = new ARC2_StoreDeleteQueryHandler($this->a, $this);
-      $r = $h->runQuery($infos);
-      $this->processTriggers('delete', $infos);
-      return $r;
-    }
-  }
-  
-  function replace($doc, $g, $doc_2) {
-    return array($this->delete($doc, $g), $this->insert($doc_2, $g));
-  }
-  
-  function dump() {
-    ARC2::inc('StoreDumper');
-    $d = new ARC2_StoreDumper($this->a, $this);
-    $d->dumpSPOG();
-  }
-  
-  function createBackup($path, $q = '') {
-    ARC2::inc('StoreDumper');
-    $d = new ARC2_StoreDumper($this->a, $this);
-    $d->saveSPOG($path, $q);
-  }
-  
-  function renameTo($name) {
-    $con = $this->getDBCon();
-    $tbls = $this->getTables();
-    $old_prefix = $this->getTablePrefix();
-    $new_prefix = $this->v('db_table_prefix', '', $this->a);
-    $new_prefix .= $new_prefix ? '_' : '';
-    $new_prefix .= $name . '_';
-    foreach ($tbls as $tbl) {
-      $rs = $this->queryDB('RENAME TABLE ' . $old_prefix . $tbl .' TO ' . $new_prefix . $tbl, $con);
-      if ($er = mysql_error($con)) {
-        return $this->addError($er);
-      }
-    }
-    $this->a['store_name'] = $name;
-    unset($this->tbl_prefix);
-  }
-  
-  function replicateTo($name) {
-    $conf = array_merge($this->a, array('store_name' => $name));
-    $new_store = ARC2::getStore($conf);
-    $new_store->setUp();
-    $new_store->reset();
-    $con = $this->getDBCon();
-    $tbls = $this->getTables();
-    $old_prefix = $this->getTablePrefix();
-    $new_prefix = $new_store->getTablePrefix();
-    foreach ($tbls as $tbl) {
-      $rs = $this->queryDB('INSERT IGNORE INTO ' . $new_prefix . $tbl .' SELECT * FROM ' . $old_prefix . $tbl, $con);
-      if ($er = mysql_error($con)) {
-        return $this->addError($er);
-      }
-    }
-    return $new_store->query('SELECT COUNT(*) AS t_count WHERE { ?s ?p ?o}', 'row');
-  }
-  
-  /*  */
-  
-  function query($q, $result_format = '', $src = '', $keep_bnode_ids = 0, $log_query = 0) {
-    if ($log_query) $this->logQuery($q);
-    $con = $this->getDBCon();
-    if (preg_match('/^dump/i', $q)) {
-      $infos = array('query' => array('type' => 'dump'));
-    }
-    else {
-      ARC2::inc('SPARQLPlusParser');
-      $p = new ARC2_SPARQLPlusParser($this->a, $this);
-      $p->parse($q, $src);
-      $infos = $p->getQueryInfos();
-    }
-    if ($result_format == 'infos') return $infos;
-    $infos['result_format'] = $result_format;
-    if (!isset($p) || !$p->getErrors()) {
-      $qt = $infos['query']['type'];
-      if (!in_array($qt, array('select', 'ask', 'describe', 'construct', 'load', 'insert', 'delete', 'dump'))) {
-        return $this->addError('Unsupported query type "'.$qt.'"');
-      }
-      $t1 = ARC2::mtime();
-      $r = array('query_type' => $qt, 'result' => $this->runQuery($infos, $qt, $keep_bnode_ids, $q));
-      $t2 = ARC2::mtime();
-      $r['query_time'] = $t2 - $t1;
-      /* query result */
-      if ($result_format == 'raw') {
-        return $r['result'];
-      }
-      if ($result_format == 'rows') {
-        return $r['result']['rows'] ? $r['result']['rows'] : array();
-      }
-      if ($result_format == 'row') {
-        return $r['result']['rows'] ? $r['result']['rows'][0] : array();
-      }
-      return $r;
-    }
-    return 0;
-  }
-
-  function runQuery($infos, $type, $keep_bnode_ids = 0, $q = '') {
-    ARC2::inc('Store' . ucfirst($type) . 'QueryHandler');
-    $cls = 'ARC2_Store' . ucfirst($type) . 'QueryHandler';
-    $h = new $cls($this->a, $this);
-    $ticket = 1;
-    $r = array();
-    if ($q && ($type == 'select')) $ticket = $this->getQueueTicket($q);
-    if ($ticket) {
-      if ($type == 'load') {/* the LoadQH supports raw data as 2nd parameter */
-        $r = $h->runQuery($infos, '', $keep_bnode_ids);
-      }
-      else {
-        $r = $h->runQuery($infos, $keep_bnode_ids);
-      }
-    }
-    if ($q && ($type == 'select')) $this->removeQueueTicket($ticket);
-    $trigger_r = $this->processTriggers($type, $infos);
-    return $r;
-  }
-  
-  function processTriggers($type, $infos) {
-    $r = array();
-    $trigger_defs = $this->triggers;
-    $this->triggers = array();
-    if ($triggers = $this->v($type, array(), $trigger_defs)) {
-      $r['trigger_results'] = array();
-      $triggers = is_array($triggers) ? $triggers : array($triggers);
-      $trigger_inc_path = $this->v('store_triggers_path', '', $this->a);
-      foreach ($triggers as $trigger) {
-        $trigger .= !preg_match('/Trigger$/', $trigger) ? 'Trigger' : '';
-        if (ARC2::inc(ucfirst($trigger), $trigger_inc_path)) {
-          $cls = 'ARC2_' . ucfirst($trigger);
-          $config = array_merge($this->a, array('query_infos' => $infos));
-          $trigger_obj = new $cls($config, $this);
-          if (method_exists($trigger_obj, 'go')) {
-            $r['trigger_results'][] = $trigger_obj->go();
-          }
-        }
-      }
-    }
-    $this->triggers = $trigger_defs;
-    return $r;
-  }
-  
-  /*  */
-
-  function getValueHash($val) {
-    return abs(crc32($val));
-  }
-
-  function getTermID($val, $term = '') {
-    $tbl = preg_match('/^(s|o)$/', $term) ? $term . '2val' : 'id2val';
-    $con = $this->getDBCon();
-    /* via hash */
-    if (preg_match('/^(s2val|o2val)$/', $tbl) && $this->hasHashColumn($tbl)) {
-      $sql = "SELECT id, val FROM " . $this->getTablePrefix() . $tbl . " WHERE val_hash = '" . $this->getValueHash($val) . "'";
-      if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs)) {
-        while ($row = mysql_fetch_array($rs)) {
-          if ($row['val'] == $val) {
-            return $row['id'];
-          }
-        }
-      }
-    }
-    /* exact match */
-    else {
-      $sql = "SELECT id FROM " . $this->getTablePrefix() . $tbl . " WHERE val = BINARY '" . mysql_real_escape_string($val, $con) . "' LIMIT 1";
-      if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs) && ($row = mysql_fetch_array($rs))) {
-        return $row['id'];
-      }
-    }
-    return 0;
-  }
-
-  function getIDValue($id, $term = '') {
-    $tbl = preg_match('/^(s|o)$/', $term) ? $term . '2val' : 'id2val';
-    $con = $this->getDBCon();
-    $sql = "SELECT val FROM " . $this->getTablePrefix() . $tbl . " WHERE id = " . mysql_real_escape_string($id, $con) . " LIMIT 1";
-    if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs) && ($row = mysql_fetch_array($rs))) {
-      return $row['val'];
-    }
-    return 0;
-  }
-
-  /*  */
-  
-  function getLock($t_out = 10, $t_out_init = '') {
-    if (!$t_out_init) $t_out_init = $t_out;
-    $con = $this->getDBCon();
-    $l_name = $this->a['db_name'] . '.' . $this->getTablePrefix() . '.write_lock';
-    if ($rs = $this->queryDB('SELECT IS_FREE_LOCK("' . $l_name. '") AS success', $con)) {
-      $row = mysql_fetch_array($rs);
-      if (!$row['success']) {
-        if ($t_out) {
-          sleep(1);
-          return $this->getLock($t_out - 1, $t_out_init);
-        }
-      }
-      elseif ($rs = $this->queryDB('SELECT GET_LOCK("' . $l_name. '", ' . $t_out_init. ') AS success', $con)) {
-        $row = mysql_fetch_array($rs);
-        return $row['success'];
-      }
-    }
-    return 0;   
-  }
-  
-  function releaseLock() {
-    $con = $this->getDBCon();
-    return $this->queryDB('DO RELEASE_LOCK("' . $this->a['db_name'] . '.' . $this->getTablePrefix() . '.write_lock")', $con);
-  }
-
-  /*  */
-
-  function processTables($level = 2, $operation = 'optimize') {/* 1: triple + g2t, 2: triple + *2val, 3: all tables */
-    $con = $this->getDBCon();
-    $pre = $this->getTablePrefix();
-    $tbls = $this->getTables();
-    $sql = '';
-    foreach ($tbls as $tbl) {
-      if (($level < 3) && preg_match('/(backup|setting)$/', $tbl)) continue;
-      if (($level < 2) && preg_match('/(val)$/', $tbl)) continue;
-      $sql .= $sql ? ', ' : strtoupper($operation) . ' TABLE ';
-      $sql .= $pre . $tbl;
-    }
-    $this->queryDB($sql, $con);
-    if ($err = mysql_error($con)) $this->addError($err . ' in ' . $sql);
-  }
-
-  function optimizeTables($level = 2) {
-    if ($this->v('ignore_optimization')) return 1;
-    return $this->processTables($level, 'optimize');
-  }
-
-  function checkTables($level = 2) {
-    return $this->processTables($level, 'check');
-  }
-
-  function repairTables($level = 2) {
-    return $this->processTables($level, 'repair');
-  }
-
-  /*  */
-
-  function changeNamespaceURI($old_uri, $new_uri) {
-    ARC2::inc('StoreHelper');
-    $c = new ARC2_StoreHelper($this->a, $this);
-    return $c->changeNamespaceURI($old_uri, $new_uri);
-  }
-  
-  /*  */
-  
-  function getResourceLabel($res, $unnamed_label = 'An unnamed resource') {
-    if (!isset($this->resource_labels)) $this->resource_labels = array();
-    if (isset($this->resource_labels[$res])) return $this->resource_labels[$res];
-    if (!preg_match('/^[a-z0-9\_]+\:[^\s]+$/si', $res)) return $res;/* literal */
-    $ps = $this->getLabelProps();
-    if ($this->getSetting('store_label_properties', '-') != md5(serialize($ps))) {
-      $this->inferLabelProps($ps);
-    }
-    //$sub_q .= $sub_q ? ' || ' : '';
-    //$sub_q .= 'REGEX(str(?p), "(last_name|name|fn|title|label)$", "i")';
-    $q = 'SELECT ?label WHERE { <' . $res . '> ?p ?label . ?p a <http://semsol.org/ns/arc#LabelProperty> } LIMIT 3';
-    $r = '';
-    if ($rows = $this->query($q, 'rows')) {
-      foreach ($rows as $row) {
-        $r = strlen($row['label']) > strlen($r) ? $row['label'] : $r;
-      }
-    }
-    if (!$r && preg_match('/^\_\:/', $res)) {
-      return $unnamed_label;
-    }
-    $r = $r ? $r : preg_replace("/^(.*[\/\#])([^\/\#]+)$/", '\\2', str_replace('#self', '', $res));
-    $r = str_replace('_', ' ', $r);
-    $r = preg_replace('/([a-z])([A-Z])/e', '"\\1 " . strtolower("\\2")', $r);
-    $this->resource_labels[$res] = $r;
-    return $r;
-  }
-  
-  function getLabelProps() {
-    return array_merge(
-      $this->v('rdf_label_properties' , array(), $this->a),
-      array(
-        'http://www.w3.org/2000/01/rdf-schema#label',
-        'http://xmlns.com/foaf/0.1/name',
-        'http://purl.org/dc/elements/1.1/title',
-        'http://purl.org/rss/1.0/title',
-        'http://www.w3.org/2004/02/skos/core#prefLabel',
-        'http://xmlns.com/foaf/0.1/nick',
-      )
-    );
-  }
-  
-  function inferLabelProps($ps) {
-    $this->query('DELETE FROM <label-properties>');
-    $sub_q = '';
-    foreach ($ps as $p) {
-      $sub_q .= ' <' . $p . '> a <http://semsol.org/ns/arc#LabelProperty> . ';
-    }
-    $this->query('INSERT INTO <label-properties> { ' . $sub_q. ' }');
-    $this->setSetting('store_label_properties', md5(serialize($ps)));
-  }
-  
-  /*  */
-
-  function getResourcePredicates($res) {
-    $r = array();
-    if ($rows = $this->query('SELECT DISTINCT ?p WHERE { <' . $res . '> ?p ?o . }', 'rows')) {
-      foreach ($rows as $row) {
-        $r[$row['p']] = array();
-      }
-    }
-    return $r;
-  }
-  
-  function getDomains($p) {
-    $r = array();
-    foreach($this->query('SELECT DISTINCT ?type WHERE {?s <' . $p . '> ?o ; a ?type . }', 'rows') as $row) {
-      $r[] = $row['type'];
-    }
-    return $r;
-  }
-
-  function getPredicateRange($p) {
-    $row = $this->query('SELECT ?val WHERE {<' . $p . '> rdfs:range ?val . } LIMIT 1', 'row');
-    return $row ? $row['val'] : '';
-  }
-
-  /*  */
-  
-  function logQuery($q) {
-    $fp = @fopen("arc_query_log.txt", "a");
-    @fwrite($fp, date('Y-m-d\TH:i:s\Z', time()) . ' : ' . $q . '' . "\n\n");
-    @fclose($fp);
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreAskQueryHandler.php b/libraries/ARC2/store/ARC2_StoreAskQueryHandler.php
deleted file mode 100644
index fe1df154c..000000000
--- a/libraries/ARC2/store/ARC2_StoreAskQueryHandler.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * ARC2 SPARQL ASK query handler
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2009-12-15
-*/
-
-ARC2::inc('StoreSelectQueryHandler');
-
-class ARC2_StoreAskQueryHandler extends ARC2_StoreSelectQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-  }
-
-  /*  */
-  
-  function runQuery($infos) {
-    $infos['query']['limit'] = 1;
-    $this->infos = $infos;
-    $this->buildResultVars();
-    return parent::runQuery($this->infos);
-  }
-  
-  /*  */
-  
-  function buildResultVars() {
-    $this->infos['query']['result_vars'][] = array('var' => '1', 'aggregate' => '', 'alias' => 'success');
-  }
-
-  /*  */
-  
-  function getFinalQueryResult($q_sql, $tmp_tbl) {
-    $con = $this->store->getDBCon();
-    $rs = mysql_query('SELECT success FROM ' . $tmp_tbl, $con);
-    $r = ($row = mysql_fetch_array($rs)) ? $row['success'] : 0;
-    return $r ? true : false;
-  }
-
-  /*  */
-  
-}
-
-
diff --git a/libraries/ARC2/store/ARC2_StoreAtomLoader.php b/libraries/ARC2/store/ARC2_StoreAtomLoader.php
deleted file mode 100644
index 1bff548e4..000000000
--- a/libraries/ARC2/store/ARC2_StoreAtomLoader.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store Atom(2) Loader
-author:   Benjamin Nowack
-version:  2008-09-26
-*/
-
-ARC2::inc('AtomParser');
-
-class ARC2_StoreAtomLoader extends ARC2_AtomParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function addT($t) {
-    $this->caller->addT($t['s'], $t['p'], $t['o'], $t['s_type'], $t['o_type'], $t['o_datatype'], $t['o_lang']);
-    $this->t_count++;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreCBJSONLoader.php b/libraries/ARC2/store/ARC2_StoreCBJSONLoader.php
deleted file mode 100644
index 01e0473ad..000000000
--- a/libraries/ARC2/store/ARC2_StoreCBJSONLoader.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * ARC2 Store CrunchBase API JSON Loader
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-07
-*/
-
-ARC2::inc('CBJSONParser');
-
-class ARC2_StoreCBJSONLoader extends ARC2_CBJSONParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function done() {
-    $this->extractRDF();
-  }
-  
-  function addT($s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '') {
-    $o = $this->toUTF8($o);
-    $this->caller->addT($s, $p, $o, $s_type, $o_type, $o_dt, $o_lang);
-    $this->t_count++;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreConstructQueryHandler.php b/libraries/ARC2/store/ARC2_StoreConstructQueryHandler.php
deleted file mode 100644
index fc91ae6e2..000000000
--- a/libraries/ARC2/store/ARC2_StoreConstructQueryHandler.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDF Store CONSTRUCT Query Handler
-author:   Benjamin Nowack
-version:  2008-02-11 (Fix: auto-adding DISTINCT to avoid unnecessary duplicates)
-*/
-
-ARC2::inc('StoreSelectQueryHandler');
-
-class ARC2_StoreConstructQueryHandler extends ARC2_StoreSelectQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-  }
-
-  /*  */
-  
-  function runQuery($infos) {
-    $this->infos = $infos;
-    $this->buildResultVars();
-    $this->infos['query']['distinct'] = 1;
-    $sub_r = parent::runQuery($this->infos);
-    $rf = $this->v('result_format', '', $infos);
-    if (in_array($rf, array('sql', 'structure', 'index'))) {
-      return $sub_r;
-    }
-    return $this->getResultIndex($sub_r);
-  }
-  
-  /*  */
-  
-  function buildResultVars() {
-    $r = array();
-    foreach ($this->infos['query']['construct_triples'] as $t) {
-      foreach (array('s', 'p', 'o') as $term) {
-        if ($t[$term . '_type'] == 'var') {
-          if (!in_array($t[$term], $r)) {
-            $r[] = array('var' => $t[$term], 'aggregate' => '', 'alias' => '');
-          }
-        }
-      }
-    }
-    $this->infos['query']['result_vars'] = $r;
-  }
-
-  /*  */
-
-  function getResultIndex($qr) {
-    $r = array();
-    $added = array();
-    $rows = $this->v('rows', array(), $qr);
-    $cts = $this->infos['query']['construct_triples'];
-    $bnc = 0;
-    foreach ($rows as $row) {
-      $bnc++;
-      foreach ($cts as $ct) {
-        $skip_t = 0;
-        $t = array();
-        foreach (array('s', 'p', 'o') as $term) {
-          $val = $ct[$term];
-          $type = $ct[$term . '_type'];
-          $val = ($type == 'bnode') ? $val . $bnc : $val;
-          if ($type == 'var') {
-            $skip_t = !isset($row[$val]) ? 1 : $skip_t;
-            $type = !$skip_t ? $row[$val . ' type'] : '';
-            $val = (!$skip_t) ? $row[$val] : '';
-          }
-          $t[$term] = $val;
-          $t[$term . '_type'] = $type;
-          if (isset($row[$term . ' lang'])) {
-            $t[$term . '_lang'] = $row[$term . ' lang'];
-          }
-          if (isset($row[$term . ' datatype'])) {
-            $t[$term . '_datatype'] = $row[$term . ' datatype'];
-          }
-        }
-        if (!$skip_t) {
-          $s = $t['s'];
-          $p = $t['p'];
-          $o = $t['o'];
-          if (!isset($r[$s])) {
-            $r[$s] = array();
-          }
-          if (!isset($r[$s][$p])) {
-            $r[$s][$p] = array();
-          }
-          $o = array('value' => $o);
-          foreach (array('lang', 'type', 'datatype') as $suffix) {
-            if (isset($t['o_' . $suffix]) && $t['o_' . $suffix]) {
-              $o[$suffix] = $t['o_' . $suffix];
-            }
-          }
-          if (!isset($added[md5($s . ' ' . $p . ' ' . serialize($o))])) {
-            $r[$s][$p][] = $o;
-            $added[md5($s . ' ' . $p . ' ' . serialize($o))] = 1;
-          }
-        }
-      }
-    }
-    return $r;
-  }
-  
-  /*  */
-
-}
-
-
diff --git a/libraries/ARC2/store/ARC2_StoreDeleteQueryHandler.php b/libraries/ARC2/store/ARC2_StoreDeleteQueryHandler.php
deleted file mode 100644
index 02e6935b4..000000000
--- a/libraries/ARC2/store/ARC2_StoreDeleteQueryHandler.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * ARC2 RDF Store DELETE Query Handler
- *
- * @author Benjamin Nowack <bnowack@semsol.com>
- * @license http://arc.semsol.org/license
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-24
-*/
-
-ARC2::inc('StoreQueryHandler');
-
-class ARC2_StoreDeleteQueryHandler extends ARC2_StoreQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-    $this->handler_type = 'delete';
-  }
-
-  /*  */
-  
-  function runQuery($infos) {
-    $this->infos = $infos;
-    $con = $this->store->getDBCon();
-    $t1 = ARC2::mtime();
-    /* delete */
-    $this->refs_deleted = false;
-    /* graph(s) only */
-    if (!$this->v('construct_triples', array(), $this->infos['query'])) {
-      $tc = $this->deleteTargetGraphs();
-    }
-    /* graph(s) + explicit triples */
-    elseif (!$this->v('pattern', array(), $this->infos['query'])) {
-      $tc = $this->deleteTriples();
-    }
-    /* graph(s) + constructed triples */
-    else {
-      $tc = $this->deleteConstructedGraph();
-    }
-    $t2 = ARC2::mtime();
-    /* clean up */
-    if ($tc && ($this->refs_deleted || (rand(1, 100) == 1))) $this->cleanTableReferences();
-    if ($tc && (rand(1, 100) == 1)) $this->store->optimizeTables();
-    if ($tc && (rand(1, 500) == 1)) $this->cleanValueTables();
-    $t3 = ARC2::mtime();
-    $index_dur = round($t3 - $t2, 4);
-    $dur = round($t3 - $t1, 4);
-    return array(
-      't_count' => $tc,
-      'delete_time' => $dur,
-      'index_update_time' => $index_dur,
-    );
-  }
-  
-  /*  */
-
-  function deleteTargetGraphs() {
-    $tbl_prefix = $this->store->getTablePrefix();
-    $r = 0;
-    $con = $this->store->getDBCon();
-    foreach ($this->infos['query']['target_graphs'] as $g) {
-      if ($g_id = $this->getTermID($g, 'g')) {
-        $rs = mysql_query('DELETE FROM ' . $tbl_prefix . 'g2t WHERE g = ' .$g_id, $con);
-        $r += mysql_affected_rows($con);
-      }
-    }
-    $this->refs_deleted = $r ? 1 : 0;
-    return $r;
-  }
-  
-  /*  */
-  
-  function deleteTriples() {
-    $r = 0;
-    $dbv = $this->store->getDBVersion();
-    $tbl_prefix = $this->store->getTablePrefix();
-    $con = $this->store->getDBCon();
-    /* graph restriction */
-    $tgs = $this->infos['query']['target_graphs'];
-    $gq = '';
-    foreach ($tgs as $g) {
-      if ($g_id = $this->getTermID($g, 'g')) {
-        $gq .= $gq ? ', ' . $g_id : $g_id;
-      }
-    }
-    $gq = $gq ? ' AND G.g IN (' . $gq . ')' : '';
-    /* triples */
-    foreach ($this->infos['query']['construct_triples'] as $t) {
-      $q = '';
-      $skip = 0;
-      foreach (array('s', 'p', 'o') as $term) {
-        if (isset($t[$term . '_type']) && preg_match('/(var)/', $t[$term . '_type'])) {
-          //$skip = 1;
-        }
-        else {
-          $term_id = $this->getTermID($t[$term], $term);
-          $q .= ($q ? ' AND ' : '') . 'T.' . $term . '=' . $term_id;
-          /* explicit lang/dt restricts the matching */
-          if ($term == 'o') {
-            $o_lang = $this->v1('o_lang', '', $t);
-            $o_lang_dt = $this->v1('o_datatype', $o_lang, $t);
-            if ($o_lang_dt) {
-              $q .= ($q ? ' AND ' : '') . 'T.o_lang_dt=' . $this->getTermID($o_lang_dt, 'lang_dt');
-            }
-          }
-        }
-      }
-      if ($skip) {
-        continue;
-      }
-      if ($gq) {
-        $sql = ($dbv < '04-01') ? 'DELETE ' . $tbl_prefix . 'g2t' : 'DELETE G';
-        $sql .= '
-          FROM ' . $tbl_prefix . 'g2t G 
-          JOIN ' . $this->getTripleTable() . ' T ON (T.t = G.t' . $gq . ')
-          WHERE ' . $q . '
-        ';
-        $this->refs_deleted = 1;
-      }
-      else {/* triples only */
-        $sql = ($dbv < '04-01') ? 'DELETE ' . $this->getTripleTable() : 'DELETE T';
-        $sql .= ' FROM ' . $this->getTripleTable() . ' T WHERE ' . $q;
-      }
-      $rs = mysql_query($sql, $con);
-      if ($er = mysql_error($con)) {
-        $this->addError($er .' in ' . $sql);
-      }
-      $r += mysql_affected_rows($con);
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function deleteConstructedGraph() {
-    ARC2::inc('StoreConstructQueryHandler');
-    $h = new ARC2_StoreConstructQueryHandler($this->a, $this->store);
-    $sub_r = $h->runQuery($this->infos);
-    $triples = ARC2::getTriplesFromIndex($sub_r);
-    $tgs = $this->infos['query']['target_graphs'];
-    $this->infos = array('query' => array('construct_triples' => $triples, 'target_graphs' => $tgs));
-    return $this->deleteTriples();
-  }
-  
-  /*  */
-  
-  function cleanTableReferences() {
-    /* lock */
-    if (!$this->store->getLock()) return $this->addError('Could not get lock in "cleanTableReferences"');
-    $con = $this->store->getDBCon();
-    $tbl_prefix = $this->store->getTablePrefix();
-    $dbv = $this->store->getDBVersion();
-    /* check for unconnected triples */
-    $sql = '
-      SELECT T.t FROM '. $tbl_prefix . 'triple T LEFT JOIN '. $tbl_prefix . 'g2t G ON ( G.t = T.t )
-      WHERE G.t IS NULL LIMIT 1
-    ';
-    if (($rs = mysql_query($sql, $con)) && mysql_num_rows($rs)) {
-      /* delete unconnected triples */
-      $sql = ($dbv < '04-01') ? 'DELETE ' . $tbl_prefix . 'triple' : 'DELETE T';
-      $sql .= '
-        FROM ' . $tbl_prefix . 'triple T 
-        LEFT JOIN ' . $tbl_prefix . 'g2t G ON (G.t = T.t)
-        WHERE G.t IS NULL
-      ';
-      mysql_query($sql, $con);
-    }
-    /* check for unconnected graph refs */
-    if ((rand(1, 10) == 1)) {
-      $sql = '
-        SELECT G.g FROM '. $tbl_prefix . 'g2t G LEFT JOIN '. $tbl_prefix . 'triple T ON ( T.t = G.t )
-        WHERE T.t IS NULL LIMIT 1
-      ';
-      if (($rs = mysql_query($sql, $con)) && mysql_num_rows($rs)) {
-        /* delete unconnected graph refs */
-        $sql = ($dbv < '04-01') ? 'DELETE ' . $tbl_prefix . 'g2t' : 'DELETE G';
-        $sql .= '
-          FROM ' . $tbl_prefix . 'g2t G 
-          LEFT JOIN ' . $tbl_prefix . 'triple T ON (T.t = G.t)
-          WHERE T.t IS NULL
-        ';
-        mysql_query($sql, $con);
-      }
-    }
-    /* release lock */
-    $this->store->releaseLock();
-  }
-  
-  /*  */
-
-  function cleanValueTables() {
-    /* lock */
-    if (!$this->store->getLock()) return $this->addError('Could not get lock in "cleanValueTables"');
-    $con = $this->store->getDBCon();
-    $tbl_prefix = $this->store->getTablePrefix();
-    $dbv = $this->store->getDBVersion();
-    /* o2val */
-    $sql = ($dbv < '04-01') ? 'DELETE ' . $tbl_prefix . 'o2val' : 'DELETE V';
-    $sql .= '
-      FROM ' . $tbl_prefix . 'o2val V 
-      LEFT JOIN ' . $tbl_prefix . 'triple T ON (T.o = V.id)
-      WHERE T.t IS NULL
-    ';
-    mysql_query($sql, $con);
-    /* s2val */
-    $sql = ($dbv < '04-01') ? 'DELETE ' . $tbl_prefix . 's2val' : 'DELETE V';
-    $sql .= '
-      FROM ' . $tbl_prefix . 's2val V 
-      LEFT JOIN ' . $tbl_prefix . 'triple T ON (T.s = V.id)
-      WHERE T.t IS NULL
-    ';
-    mysql_query($sql, $con);
-    /* id2val */
-    $sql = ($dbv < '04-01') ? 'DELETE ' . $tbl_prefix . 'id2val' : 'DELETE V';
-    $sql .= '
-      FROM ' . $tbl_prefix . 'id2val V 
-      LEFT JOIN ' . $tbl_prefix . 'g2t G ON (G.g = V.id)
-      LEFT JOIN ' . $tbl_prefix . 'triple T1 ON (T1.p = V.id)
-      LEFT JOIN ' . $tbl_prefix . 'triple T2 ON (T2.o_lang_dt = V.id)
-      WHERE G.g IS NULL AND T1.t IS NULL AND T2.t IS NULL
-    ';
-    //mysql_query($sql, $con);
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreDescribeQueryHandler.php b/libraries/ARC2/store/ARC2_StoreDescribeQueryHandler.php
deleted file mode 100644
index 73a5a685d..000000000
--- a/libraries/ARC2/store/ARC2_StoreDescribeQueryHandler.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store DESCRIBE Query Handler
-author:   Benjamin Nowack
-version:  2008-01-09 (Tweak: label auto-detection is now optional)
-*/
-
-ARC2::inc('StoreSelectQueryHandler');
-
-class ARC2_StoreDescribeQueryHandler extends ARC2_StoreSelectQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-    $this->detect_labels = $this->v('detect_describe_query_labels', 0, $this->a);
-  }
-
-  /*  */
-  
-  function runQuery($infos) {
-    $ids = $infos['query']['result_uris'];
-    if ($vars = $infos['query']['result_vars']) {
-      $sub_r = parent::runQuery($infos);
-      $rf = $this->v('result_format', '', $infos);
-      if (in_array($rf, array('sql', 'structure', 'index'))) {
-        return $sub_r;
-      }
-      $rows = $this->v('rows', array(), $sub_r);
-      foreach ($rows as $row) {
-        foreach ($vars as $info) {
-          $val = isset($row[$info['var']]) ? $row[$info['var']] : '';
-          if ($val && ($row[$info['var'] . ' type'] != 'literal') && !in_array($val, $ids)) {
-            $ids[] = $val;
-          }
-        }
-      }
-    }
-    $this->r = array();
-    $this->described_ids = array();
-    $this->ids = $ids;
-    $this->added_triples = array();
-    $is_sub_describe = 0;
-    while ($this->ids) {
-      $id = $this->ids[0];
-      $this->described_ids[] = $id;
-      if ($this->detect_labels) {
-        $q = '
-          CONSTRUCT { 
-            <' . $id . '> ?p ?o . 
-            ?o ?label_p ?o_label . 
-            ?o <http://arc.semsol.org/ns/arc#label> ?o_label .
-          } WHERE { 
-            <' . $id . '> ?p ?o .
-            OPTIONAL {
-              ?o ?label_p ?o_label .
-              FILTER REGEX(str(?label_p), "(name|label|title|summary|nick|fn)$", "i") 
-            }
-          }
-        ';
-      }
-      else {
-        $q = '
-          CONSTRUCT { 
-            <' . $id . '> ?p ?o . 
-          } WHERE { 
-            <' . $id . '> ?p ?o .
-          }
-        ';
-      }
-      $sub_r = $this->store->query($q);
-      $sub_index = is_array($sub_r['result']) ? $sub_r['result'] : array();
-      $this->mergeSubResults($sub_index, $is_sub_describe);
-      $is_sub_describe = 1;
-    }
-    return $this->r;
-  }
-  
-  /*  */
-  
-  function mergeSubResults($index, $is_sub_describe = 1) {
-    foreach ($index as $s => $ps) {
-      if (!isset($this->r[$s])) $this->r[$s] = array();
-      foreach ($ps as $p => $os) {
-        if (!isset($this->r[$s][$p])) $this->r[$s][$p] = array();
-        foreach ($os as $o) {
-          $id = md5($s . ' ' . $p . ' ' . serialize($o));
-          if (!isset($this->added_triples[$id])) {
-            if (1 || !$is_sub_describe) {
-              $this->r[$s][$p][] = $o;
-              if (is_array($o) && ($o['type'] == 'bnode') && !in_array($o['value'], $this->ids)) $this->ids[] = $o['value'];
-            }
-            elseif (!is_array($o) || ($o['type'] != 'bnode')) {
-              $this->r[$s][$p][] = $o;
-            }
-            $this->added_triples[$id] = 1;
-          }
-        }
-      }
-    }
-    /* adjust ids */
-    $ids = $this->ids;
-    $this->ids = array();
-    foreach ($ids as $id) {
-      if (!in_array($id, $this->described_ids)) $this->ids[] = $id;
-    }
-  }
-  
-  /*  */
-
-}
-
-
diff --git a/libraries/ARC2/store/ARC2_StoreDumpQueryHandler.php b/libraries/ARC2/store/ARC2_StoreDumpQueryHandler.php
deleted file mode 100644
index f5198ea3a..000000000
--- a/libraries/ARC2/store/ARC2_StoreDumpQueryHandler.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDF Store DUMP Query Handler
-author:   Benjamin Nowack
-version:  2008-07-02
-*/
-
-ARC2::inc('StoreQueryHandler');
-
-class ARC2_StoreDumpQueryHandler extends ARC2_StoreQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-  }
-
-  /*  */
-  
-  function runQuery($infos, $keep_bnode_ids = 0) {
-    $this->infos = $infos;
-    $con = $this->store->getDBCon();
-    ARC2::inc('StoreDumper');
-    $d = new ARC2_StoreDumper($this->a, $this->store);
-    $d->dumpSPOG();
-    return 1;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreDumper.php b/libraries/ARC2/store/ARC2_StoreDumper.php
deleted file mode 100644
index 2a2e6b415..000000000
--- a/libraries/ARC2/store/ARC2_StoreDumper.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * ARC2 Store Dumper
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-09
-*/
-
-ARC2::inc('Class');
-
-class ARC2_StoreDumper extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->store = $this->caller;
-    $this->keep_time_limit = $this->v('keep_time_limit', 0, $this->a);
-    $this->limit = 100000;
-  }
-
-  /*  */
-  
-  function dumpSPOG() {
-    header('Content-Type: application/sparql-results+xml');
-    if ($this->v('store_use_dump_dir', 0, $this->a)) {
-      $path = $this->v('store_dump_dir', 'dumps', $this->a);
-      /* default: monthly dumps */
-      $path_suffix = $this->v('store_dump_suffix', date('Y_m'), $this->a);
-      $path .= '/dump_' . $path_suffix . '.spog';
-      if (!file_exists($path)) {
-        $this->saveSPOG($path);
-      }
-      readfile($path);
-      exit;
-    }
-    echo $this->getHeader();
-    $offset = 0;
-    do {
-      $proceed = 0;
-      $rs = $this->getRecordset($offset);
-      if (!$rs) break;
-      while ($row = mysql_fetch_array($rs)) {
-        echo $this->getEntry($row);
-        $proceed = 1;
-      }
-      $offset += $this->limit;
-    } while ($proceed);
-    echo $this->getFooter();
-  }
-
-  /*  */
-
-  function saveSPOG($path, $q = '') {
-    if ($q) return $this->saveCustomSPOG($path, $q);
-    if (!$fp = @fopen($path, 'w')) return $this->addError('Could not create backup file at ' . realpath($path));
-    fwrite($fp, $this->getHeader());
-    $offset = 0;
-    do {
-      $proceed = 0;
-      $rs = $this->getRecordset($offset);
-      if (!$rs) break;
-      while ($row = mysql_fetch_array($rs)) {
-        fwrite($fp, $this->getEntry($row));
-        $proceed = 1;
-      }
-      $offset += $this->limit;
-    } while ($proceed);
-    fwrite($fp, $this->getFooter());
-    @fclose($fp);
-    return 1;
-  }
-
-  /*  */
-
-  function saveCustomSPOG($path, $q) {
-    if (!$fp = @fopen($path, 'w')) return $this->addError('Could not create backup file at ' . realpath($path));
-    fwrite($fp, $this->getHeader());
-    $rows = $this->store->query($q, 'rows');
-    foreach ($rows as $row) {
-      fwrite($fp, $this->getEntry($row));
-    }
-    fwrite($fp, $this->getFooter());
-    @fclose($fp);
-  }
-  
-  /*  */
-
-  function getRecordset($offset) {
-    $prefix = $this->store->getTablePrefix();
-    $con = $this->store->getDBCon();
-    $sql = '
-      SELECT 
-        VS.val AS s,
-        T.s_type AS `s type`,
-        VP.val AS p,
-        0 AS `p type`,
-        VO.val AS o,
-        T.o_type AS `o type`,
-        VLDT.val as `o lang_dt`,
-        VG.val as g,
-        0 AS `g type`
-      FROM
-        ' . $prefix . 'triple T
-        JOIN ' . $prefix . 's2val VS ON (T.s = VS.id)
-        JOIN ' . $prefix . 'id2val VP ON (T.p = VP.id)
-        JOIN ' . $prefix . 'o2val VO ON (T.o = VO.id)
-        JOIN ' . $prefix . 'id2val VLDT ON (T.o_lang_dt = VLDT.id)
-        JOIN ' . $prefix . 'g2t G2T ON (T.t = G2T.t)
-        JOIN ' . $prefix . 'id2val VG ON (G2T.g = VG.id)
-    ';
-    if ($this->limit) $sql .= ' LIMIT ' . $this->limit;
-    if ($offset) $sql .= ' OFFSET ' . $offset;
-    $rs = mysql_unbuffered_query($sql, $con);
-    if (($err = mysql_error($con))) {
-      return $this->addError($err);
-    }
-    return $rs;
-  }
-
-  /*  */
-  
-  function getHeader() {
-    $n = "\n";
-    return '' .
-      '<?xml version="1.0"?>' . 
-      $n . '<sparql xmlns="http://www.w3.org/2005/sparql-results#">' .
-      $n . '  <head>' .
-      $n . '    <variable name="s"/>' .
-      $n . '    <variable name="p"/>' .
-      $n . '    <variable name="o"/>' .
-      $n . '    <variable name="g"/>' .
-      $n . '  </head>' .
-      $n . '  <results>' .
-    '';
-  }
-
-  function getEntry($row) {
-    if (!$this->keep_time_limit) @set_time_limit($this->v('time_limit', 1200, $this->a));
-    $n = "\n";
-    $r = '';
-    $r .= $n . '    <result>';
-    foreach (array('s', 'p', 'o', 'g') as $var) {
-      if (isset($row[$var])) {
-        $type = (string) $row[$var . ' type'];
-        $r .= $n . '      <binding name="' . $var . '">';
-        $val = $this->toUTF8($row[$var]);
-        if (($type == '0') || ($type == 'uri')) {
-          $r .= $n . '        <uri>' . $this->getSafeValue($val) . '</uri>';
-        }
-        elseif (($type == '1') || ($type == 'bnode')) {
-          $r .= $n . '        <bnode>' . substr($val, 2) . '</bnode>';
-        }
-        else {
-          $lang_dt = '';
-          foreach (array('o lang_dt', 'o lang', 'o datatype') as $k) {
-            if (($var == 'o') && isset($row[$k]) && $row[$k]) $lang_dt = $row[$k];
-          }
-          $is_lang = preg_match('/^([a-z]+(\-[a-z0-9]+)*)$/i', $lang_dt);
-          list($lang, $dt) = $is_lang ? array($lang_dt, '') : array('', $lang_dt);
-          $lang = $lang ? ' xml:lang="' . $lang . '"' : '';
-          $dt = $dt ? ' datatype="' . htmlspecialchars($dt) . '"' : '';
-          $r .= $n . '        <literal' . $dt . $lang . '>' . $this->getSafeValue($val) . '</literal>';
-        }
-        $r .= $n . '      </binding>';
-      }
-    }
-    $r .= $n . '    </result>';
-    return $r;
-  }
-
-  function getSafeValue($val) {/* mainly for fixing json_decode bugs */
-    $mappings = array(
-      '%00' => '',
-      '%01' => '',
-      '%02' => '',
-      '%03' => '',
-      '%04' => '',
-      '%05' => '',
-      '%06' => '',
-      '%07' => '',
-      '%08' => '',
-      '%09' => '',
-      '%0B' => '',
-      '%0C' => '',
-      '%0E' => '',
-      '%0F' => '',
-      '%15' => '',
-      '%17' => 'ė',
-      '%1A' => ',',
-      '%1F' => '',
-    );
-    $froms = array_keys($mappings);
-    $tos = array_values($mappings);
-    foreach ($froms as $i => $from) $froms[$i] = urldecode($from);
-    $val = str_replace($froms, $tos, $val);
-    if (strpos($val, '</') !== false) {
-      $val = "\n<![CDATA[\n" . $val . "\n]]>\n";
-    }
-    else {
-      $val = htmlspecialchars($val);
-    }
-    return $val;
-  }
-
-  function getFooter() {
-    $n = "\n";
-    return '' .
-      $n . '  </results>' .
-      $n . '</sparql>' . 
-      $n .
-    '';
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreEndpoint.php b/libraries/ARC2/store/ARC2_StoreEndpoint.php
deleted file mode 100644
index 0c151d18f..000000000
--- a/libraries/ARC2/store/ARC2_StoreEndpoint.php
+++ /dev/null
@@ -1,1080 +0,0 @@
-<?php
-/**
- * ARC2 SPARQL Endpoint
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-04
-*/
-
-ARC2::inc('Store');
-
-class ARC2_StoreEndpoint extends ARC2_Store {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-    $this->headers = array('http' => 'HTTP/1.1 200 OK', 'vary' => 'Vary: Accept');
-    $this->read_key = $this->v('endpoint_read_key', '', $this->a);
-    $this->write_key = $this->v('endpoint_write_key', '', $this->a);
-    $this->timeout = $this->v('endpoint_timeout', 0, $this->a);
-    $this->a['store_allow_extension_functions'] = $this->v('store_allow_extension_functions', 0, $this->a);    
-    $this->allow_sql = $this->v('endpoint_enable_sql_output', 0, $this->a);
-    $this->result = '';
-  }
-
-  /*  */
-  
-  function getQueryString($mthd = '') {
-    $r = '';
-    if (!$mthd || ($mthd == 'post')) {
-      $r = @file_get_contents('php://input');
-    }
-    $r = !$r ?$this->v1('QUERY_STRING', '', $_SERVER) : $r;
-    return $r;
-  }
-
-  function p($name='', $mthd = '', $multi = '', $default = '') {
-    $mthd = strtolower($mthd);
-    if($multi){
-      $qs = $this->getQueryString($mthd);
-      if (preg_match_all('/\&' . $name . '=([^\&]+)/', $qs, $m)){
-        foreach ($m[1] as $i => $val) {
-          $m[1][$i] = stripslashes($val);
-        }
-        return $m[1];
-      }
-      return $default ? $default : array();
-    }
-    $args = array_merge($_GET, $_POST);
-    $r = isset($args[$name]) ? $args[$name] : $default;
-    return is_array($r) ? $r : stripslashes($r);
-  }
-  
-  /*  */
-
-  function getFeatures() {
-    return $this->v1('endpoint_features', array(), $this->a);
-  }
-
-  function setHeader($k, $v) {
-    $this->headers[$k] = $v;
-  }
-  
-  function sendHeaders() {
-    if (!isset($this->is_dump) || !$this->is_dump) {
-      $this->setHeader('content-length', 'Content-Length: ' . strlen($this->getResult()));
-      foreach ($this->headers as $k => $v) {
-        header($v);
-      }
-    }
-  }
-  
-  function getResult() {
-    return $this->result;
-  }
-  
-  /*  */
-  
-  function handleRequest($auto_setup = 0) {
-    if (!$this->isSetUp()) {
-      if ($auto_setup) {
-        $this->setUp();
-        return $this->handleRequest(0);
-      }
-      else {
-        $this->setHeader('http', 'HTTP/1.1 400 Bad Request');
-        $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-        $this->result = 'Missing configuration or the endpoint store was not set up yet.';
-      }
-    }
-    elseif (($img = $this->p('img'))) {
-      $this->handleImgRequest($img);
-    }
-    elseif (($q = $this->p('query'))) {
-      $this->checkProcesses();
-      $this->handleQueryRequest($q);
-      if ($this->p('show_inline')) {
-        $this->query_result = '
-          <div class="results">
-            ' . ($this->p('output') != 'htmltab' ? '<pre>' . htmlspecialchars($this->getResult()) . '</pre>' : $this->getResult()) . '
-          </div>
-        ';
-        $this->handleEmptyRequest(1);
-      }
-    }
-    else {
-      $this->handleEmptyRequest();
-    }
-  }
-  
-  function go($auto_setup = 0) {
-    $this->handleRequest($auto_setup);
-    $this->sendHeaders();
-    echo $this->getResult();
-  }
-  
-  /*  */
-  
-  function handleImgRequest($img) {
-    $this->setHeader('content-type', 'Content-type: image/gif');
-    $imgs = array(
-      'bg_body' => base64_decode('R0lGODlhAQBkAMQAAPf39/Hx8erq6vPz8/Ly8u/v7+np6fT09Ovr6/b29u3t7ejo6Pz8/Pv7+/39/fr6+vj4+P7+/vn5+f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAABAGQAAAUp4GIIiFIExHAkAAC9cAxJdG3TT67vTe//jKBQ6Cgaj5GkcpmcOJ/QZwgAOw=='),
-    );
-    $this->result = isset($imgs[$img]) ? $imgs[$img] : '';
-    $this->sendHeaders();
-    echo $this->getResult();
-    exit;
-  }
-  
-  /*  */
-  
-  function handleEmptyRequest($force = 0) {
-    /* service description */
-    $formats = array(
-      'rdfxml' => 'RDFXML', 'rdf+xml' => 'RDFXML', 'html' => 'HTML'
-    );
-    if (!$force && $this->getResultFormat($formats, 'html') != 'HTML') {
-      $this->handleServiceDescriptionRequest();
-    }
-    else {
-      $this->setHeader('content-type', 'Content-type: text/html; charset=utf-8');
-      $this->result = $this->getHTMLFormDoc();
-    }
-  }
-
-  /*  */
-
-  function handleServiceDescriptionRequest() {
-    $q = '
-      PREFIX void: <http://rdfs.org/ns/void#>
-      CONSTRUCT {
-        <> void:sparqlEndpoint <> .
-      }
-      WHERE {
-        ?s ?p ?o .
-      } LIMIT 1
-    ';
-    $this->handleQueryRequest($q);
-  }
-
-  /*  */
-
-  function checkProcesses() {
-    if (method_exists($this->caller, 'checkSPARQLEndpointProcesses')) {
-      $sub_r = $this->caller->checkSPARQLEndpointProcesses();
-    }
-    elseif ($this->timeout) {
-      $this->killDBProcesses('', $this->timeout);
-    }
-  }
-  
-  /*  */
-
-  function handleQueryRequest($q) {
-    if (preg_match('/^dump/i', $q)) {
-      $infos = array('query' => array('type' => 'dump'));
-      $this->is_dump = 1;
-    }
-    else {
-      ARC2::inc('SPARQLPlusParser');
-      $p = new ARC2_SPARQLPlusParser($this->a, $this);
-      $p->parse($q);
-      $infos = $p->getQueryInfos();
-    }
-    /* errors? */
-    if ($errors = $this->getErrors()) {
-      $this->setHeader('http', 'HTTP/1.1 400 Bad Request');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = join("\n", $errors);
-      return true;
-    }
-    $qt = $infos['query']['type'];
-    /* wrong read key? */
-    if ($this->read_key && ($this->p('key') != $this->read_key) && preg_match('/^(select|ask|construct|describe|dump)$/', $qt)) {
-      $this->setHeader('http', 'HTTP/1.1 401 Access denied');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Access denied. Missing or wrong "key" parameter.';
-      return true;
-    }
-    /* wrong write key? */
-    if ($this->write_key && ($this->p('key') != $this->write_key) && preg_match('/^(load|insert|delete|update)$/', $qt)) {
-      $this->setHeader('http', 'HTTP/1.1 401 Access denied');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Access denied. Missing or wrong "key" parameter.';
-      return true;
-    }
-    /* non-allowed query type? */
-    if (!in_array($qt, $this->getFeatures())) {
-      $this->setHeader('http', 'HTTP/1.1 401 Access denied');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Access denied for "' .$qt. '" query';
-      return true;
-    }
-    /* load/insert/delete via GET */
-    if (in_array($qt, array('load', 'insert', 'delete')) && isset($_GET['query'])) {
-      $this->setHeader('http', 'HTTP/1.1 501 Not Implemented');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Query type "' .$qt. '" not supported via GET';
-      return true;
-    }
-    /* unsupported query type */
-    if (!in_array($qt, array('select', 'ask', 'describe', 'construct', 'load', 'insert', 'delete', 'dump'))) {
-      $this->setHeader('http', 'HTTP/1.1 501 Not Implemented');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Unsupported query type "' .$qt. '"';
-      return true;
-    }
-    /* adjust infos */
-    $infos = $this->adjustQueryInfos($infos);
-    $t1 = ARC2::mtime();
-    $r = array('result' => $this->runQuery($infos, $qt));
-    $t2 = ARC2::mtime();
-    $r['query_time'] = $t2 - $t1;
-    /* query errors? */
-    if ($errors = $this->getErrors()) {
-      $this->setHeader('http', 'HTTP/1.1 400 Bad Request');
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Error: ' . join("\n", $errors);
-      return true;
-    }
-    /* result */
-    $m = 'get' . ucfirst($qt) . 'ResultDoc';
-    if (method_exists($this, $m)) {
-      $this->result = $this->$m($r);
-    }
-    else {
-      $this->setHeader('content-type', 'Content-type: text/plain; charset=utf-8');
-      $this->result = 'Result serializer not available, dumping raw data:' . "\n" . print_r($r, 1);
-    }
-  }
-  
-  /*  */
-
-  function adjustQueryInfos($infos) {
-    /* limit */
-    if ($max_l = $this->v('endpoint_max_limit', 0, $this->a)) {
-      if ($this->v('limit', $max_l + 1, $infos['query']) > $max_l) {
-        $infos['query']['limit'] = $max_l;
-      }
-    }
-    /* default-graph-uri / named-graph-uri */
-    $dgs = $this->p('default-graph-uri', '', 1);
-    $ngs = $this->p('named-graph-uri', '', 1);
-    if (count(array_merge($dgs, $ngs))) {
-      $ds = array();
-      foreach ($dgs as $g) {
-        $ds[] = array('graph' => $this->calcURI($g), 'named' => 0);
-      }
-      foreach ($ngs as $g) {
-        $ds[] = array('graph' => $this->calcURI($g), 'named' => 1);
-      }
-      $infos['query']['dataset'] = $ds;
-    }
-    /* infos result format */
-    if (($this->p('format') == 'infos') || ($this->p('output') == 'infos')) {
-      $infos['result_format'] = 'structure';
-    }
-    /* sql result format */
-    if (($this->p('format') == 'sql') || ($this->p('output') == 'sql')) {
-      $infos['result_format'] = 'sql';
-    }
-    return $infos;
-  }
-  
-  /*  */
-
-  function getResultFormat($formats, $default) {
-    $prefs = array();
-    /* arg */
-    if (($v = $this->p('format')) || ($v = $this->p('output'))) {
-      $prefs[] = $v;
-    }
-    /* accept header */
-    $vals = explode(',', $_SERVER['HTTP_ACCEPT']);
-    if ($vals) {
-      $o_vals = array();
-      foreach ($vals as $val) {
-        if (preg_match('/(rdf\+n3|x\-turtle|rdf\+xml|sparql\-results\+xml|sparql\-results\+json|json)/', $val, $m)) {
-          $o_vals[$m[1]] = 1;
-          if (preg_match('/\;q\=([0-9\.]+)/', $val, $sub_m)) {
-            $o_vals[$m[1]] = 1 * $sub_m[1];
-          }
-        }
-      }
-      arsort($o_vals);
-      foreach ($o_vals as $val => $prio) {
-        $prefs[] = $val;
-      }
-    }
-    /* default */
-    $prefs[] = $default;
-    foreach ($prefs as $pref) {
-      if (isset($formats[$pref])) {
-        return $formats[$pref];
-      }
-    }
-  }
-
-  /* SELECT */
-
-  function getSelectResultDoc($r) {
-    $formats = array(
-      'xml' => 'SPARQLXML', 'sparql-results+xml' => 'SPARQLXML', 
-      'json' => 'SPARQLJSON', 'sparql-results+json' => 'SPARQLJSON',
-      'php_ser' => 'PHPSER', 'plain' => 'Plain', 
-      'sql' => ($this->allow_sql ? 'Plain' : 'xSQL'),
-      'infos' => 'Plain',
-      'htmltab' => 'HTMLTable',
-      'tsv' => 'TSV',
-    );
-    if ($f = $this->getResultFormat($formats, 'xml')) {
-      $m = 'get' . $f . 'SelectResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-  
-  function getSPARQLXMLSelectResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+xml');
-    $vars = $r['result']['variables'];
-    $rows = $r['result']['rows'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    /* doc */
-    $r = '' .
-      '<?xml version="1.0"?>' . 
-      $nl . '<sparql xmlns="http://www.w3.org/2005/sparql-results#">' .
-    '';
-    /* head */
-    $r .= $nl . '  <head>';
-    $r .= $nl . '    <!-- query time: '. round($dur, 4) .' sec -->';
-    if (is_array($vars)) {
-      foreach ($vars as $var) {
-        $r .= $nl . '    <variable name="' .$var. '"/>';
-      }
-    }
-    $r .= $nl . '  </head>';
-    /* results */
-    $r .= $nl . '  <results>';
-    if (is_array($rows)) {
-      foreach ($rows as $row) {
-        $r .= $nl . '    <result>';
-        foreach ($vars as $var) {
-          if (isset($row[$var])) {
-            $r .= $nl . '      <binding name="' .$var. '">';
-            if ($row[$var . ' type'] == 'uri') {
-              $r .= $nl . '        <uri>' .htmlspecialchars($row[$var]). '</uri>';
-            }
-            elseif ($row[$var . ' type'] == 'bnode') {
-              $r .= $nl . '        <bnode>' .substr($row[$var], 2). '</bnode>';
-            }
-            else {
-              $dt = isset($row[$var . ' datatype']) ? ' datatype="' .htmlspecialchars($row[$var . ' datatype']). '"' : '';
-              $lang = isset($row[$var . ' lang']) ? ' xml:lang="' .htmlspecialchars($row[$var . ' lang']). '"' : '';
-              $r .= $nl . '        <literal' . $dt . $lang . '>' .htmlspecialchars($row[$var]). '</literal>';
-            }
-            $r .= $nl . '      </binding>';
-          }
-        }
-        $r .= $nl . '    </result>';
-      }
-    }
-    $r .= $nl . '  </results>';
-    /* /doc */
-    $r .= $nl . '</sparql>';
-    return $r;
-  }
-  
-  function getSPARQLJSONSelectResultDoc($r) {
-    $con = $this->getDBCon();
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+json');
-    $vars = $r['result']['variables'];
-    $rows = $r['result']['rows'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    /* doc */
-    $r = '{';
-    /* head */
-    $r .= $nl . '  "head": {';
-    $r .= $nl . '    "vars": [';
-    $first_var = 1;
-    foreach ($vars as $var) {
-      $r .= $first_var ? $nl : ',' . $nl;
-      $r .= '      "' .$var. '"';
-      $first_var = 0;
-    }
-    $r .= $nl . '    ]';
-    $r .= $nl . '  },';
-    /* results */
-    $r .= $nl . '  "results": {';
-    $r .= $nl . '    "bindings": [';
-    $first_row = 1;
-    foreach ($rows as $row) {
-      $r .= $first_row ? $nl : ',' . $nl;
-      $r .= '      {';
-      $first_var = 1;
-      foreach ($vars as $var) {
-        if (isset($row[$var])) {
-          $r .= $first_var ? $nl : ',' . $nl . $nl;
-          $r .= '        "' .$var. '": {';
-          if ($row[$var . ' type'] == 'uri') {
-            $r .= $nl . '          "type": "uri",';
-            $r .= $nl . '          "value": "' .mysql_real_escape_string($row[$var], $con). '"';
-          }
-          elseif ($row[$var . ' type'] == 'bnode') {
-            $r .= $nl . '          "type": "bnode",';
-            $r .= $nl . '          "value": "' . substr($row[$var], 2) . '"';
-          }
-          else {
-            $dt = isset($row[$var . ' datatype']) ? ',' . $nl .'          "datatype": "' .mysql_real_escape_string($row[$var . ' datatype'], $con). '"' : '';
-            $lang = isset($row[$var . ' lang']) ? ',' . $nl .'          "xml:lang": "' .mysql_real_escape_string($row[$var . ' lang'], $con). '"' : '';
-            $type = $dt ? 'typed-literal' : 'literal';
-            $r .= $nl . '          "type": "' . $type . '",';
-            $r .= $nl . '          "value": "' . $this->jsonEscape($row[$var]) . '"';
-            $r .= $dt . $lang;
-          }
-          $r .= $nl . '        }';
-          $first_var = 0;
-        }
-      }
-      $r .= $nl . '      }';
-      $first_row = 0;
-    }
-    $r .= $nl . '    ]';
-    $r .= $nl . '  }';
-    /* /doc */
-    $r .= $nl . '}';
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }
-  
-  function getPHPSERSelectResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-
-  function getPlainSelectResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return print_r($r['result'], 1);
-  }
-
-  function getHTMLTableSelectResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/html; charset=utf-8');
-    $vars = $r['result']['variables'];
-    $rows = $r['result']['rows'];
-    $dur = $r['query_time'];
-    if ($this->p('show_inline')) return '<table>' . $this->getHTMLTableRows($rows, $vars) . '</table>';
-    return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-      ' .$this->getHTMLDocHead() . '
-      <body>
-        <table>
-          ' . $this->getHTMLTableRows($rows, $vars) . '
-        </table>
-      </body>
-      </html>
-    ';
-  }
-
-  function getHTMLTableRows($rows, $vars) {
-    $r = '';
-    foreach ($rows as $row) {
-      $hr = '';
-      $rr = '';
-      foreach ($vars as $var) {
-        $hr .= $r ? '' : '<th>' . htmlspecialchars($var) . '</th>';
-        $rr .= '<td>' . @htmlspecialchars($row[$var]) . '</td>';
-      }
-      $r .= $hr ? '<tr>' . $hr . '</tr>' : '';
-      $r .= '<tr>' . $rr . '</tr>';
-    }
-    return $r ? $r : '<em>No results found</em>';
-  }
-
-  function getTSVSelectResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain; charset=utf-8');
-    $vars = $r['result']['variables'];
-    $rows = $r['result']['rows'];
-    $dur = $r['query_time'];
-    return $this->getTSVRows($rows, $vars);
-  }
-
-  function getTSVRows($rows, $vars) {
-    $r = '';
-    $delim = "\t";
-    $esc_delim = "\\t";
-    foreach ($rows as $row) {
-      $hr = '';
-      $rr = '';
-      foreach ($vars as $var) {
-        $hr .= $r ? '' : ($hr ? $delim . $var : $var);
-        $val = isset($row[$var]) ? str_replace($delim, $esc_delim, $row[$var]) : '';
-        $rr .= $rr ? $delim . $val : $val;
-      }
-      $r .= $hr . "\n" . $rr;
-    }
-    return $r ? $r : 'No results found';
-  }
-
-  /* ASK */
-  
-  function getAskResultDoc($r) {
-    $formats = array(
-      'xml' => 'SPARQLXML', 'sparql-results+xml' => 'SPARQLXML', 
-      'json' => 'SPARQLJSON', 'sparql-results+json' => 'SPARQLJSON',
-      'plain' => 'Plain',
-      'php_ser' => 'PHPSER',
-      'sql' => ($this->allow_sql ? 'Plain' : 'xSQL'),
-      'infos' => 'Plain',
-    );
-    if ($f = $this->getResultFormat($formats, 'xml')) {
-      $m = 'get' . $f . 'AskResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-
-  function getSPARQLXMLAskResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+xml');
-    $r_val = $r['result'] ? 'true' : 'false';
-    $dur = $r['query_time'];
-    $nl = "\n";
-    return '' .
-      '<?xml version="1.0"?>' .
-      $nl . '<sparql xmlns="http://www.w3.org/2005/sparql-results#">' .
-      $nl . '  <head>' .
-      $nl . '    <!-- query time: '. round($dur, 4) .' sec -->' .
-      $nl . '  </head>' .
-      $nl . '  <boolean>' .$r_val. '</boolean>' .
-      $nl . '</sparql>' .
-    '';
-  }
-  
-  function getSPARQLJSONAskResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+json');
-    $r_val = $r['result'] ? 'true' : 'false';
-    $dur = $r['query_time'];
-    $nl = "\n";
-    $r = '' .
-      $nl . '{' .
-      $nl . '  "head": {' .
-      $nl . '  },' .
-      $nl . '  "boolean" : ' . $r_val . 
-      $nl . '}' . 
-    '';
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }    
-  
-  function getPHPSERAskResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-
-  function getPlainAskResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return $r['result'] ? 'true' : 'false';
-  }
-
-  /* CONSTRUCT */
-
-  function getConstructResultDoc($r) {
-    $formats = array(
-      'rdfxml' => 'RDFXML', 'rdf+xml' => 'RDFXML', 
-      'json' => 'RDFJSON', 'rdf+json' => 'RDFJSON',
-      'turtle' => 'Turtle', 'x-turtle' => 'Turtle', 'rdf+n3' => 'Turtle',
-      'php_ser' => 'PHPSER',
-      'sql' => ($this->allow_sql ? 'Plain' : 'xSQL'),
-      'infos' => 'Plain',
-    );
-    if ($f = $this->getResultFormat($formats, 'rdfxml')) {
-      $m = 'get' . $f . 'ConstructResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-  
-  function getRDFXMLConstructResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/rdf+xml');
-    $index = $r['result'];
-    $ser = ARC2::getRDFXMLSerializer($this->a);
-    $dur = $r['query_time'];
-    return $ser->getSerializedIndex($index) . "\n" . '<!-- query time: ' . $dur . ' -->';
-  }
-  
-  function getTurtleConstructResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/x-turtle');
-    $index = $r['result'];
-    $ser = ARC2::getTurtleSerializer($this->a);
-    $dur = $r['query_time'];
-    return '# query time: ' . $dur . "\n" . $ser->getSerializedIndex($index);
-  }
-  
-  function getRDFJSONConstructResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/json');
-    $index = $r['result'];
-    $ser = ARC2::getRDFJSONSerializer($this->a);
-    $dur = $r['query_time'];
-    $r = $ser->getSerializedIndex($index);
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }
-
-  function getPHPSERConstructResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-
-  function getPlainConstructResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return print_r($r['result'], 1);
-  }
-
-  /* DESCRIBE */
-  
-  function getDescribeResultDoc($r) {
-    $formats = array(
-      'rdfxml' => 'RDFXML', 'rdf+xml' => 'RDFXML', 
-      'json' => 'RDFJSON', 'rdf+json' => 'RDFJSON',
-      'turtle' => 'Turtle', 'x-turtle' => 'Turtle', 'rdf+n3' => 'Turtle',
-      'php_ser' => 'PHPSER',
-      'sql' => ($this->allow_sql ? 'Plain' : 'xSQL'),
-      'infos' => 'Plain'
-    );
-    if ($f = $this->getResultFormat($formats, 'rdfxml')) {
-      $m = 'get' . $f . 'DescribeResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-  
-  function getRDFXMLDescribeResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/rdf+xml');
-    $index = $r['result'];
-    $ser = ARC2::getRDFXMLSerializer($this->a);
-    $dur = $r['query_time'];
-    return $ser->getSerializedIndex($index) . "\n" . '<!-- query time: ' . $dur . ' -->';
-  }
-  
-  function getTurtleDescribeResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/x-turtle');
-    $index = $r['result'];
-    $ser = ARC2::getTurtleSerializer($this->a);
-    $dur = $r['query_time'];
-    return '# query time: ' . $dur . "\n" . $ser->getSerializedIndex($index);
-  }
-  
-  function getRDFJSONDescribeResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/json');
-    $index = $r['result'];
-    $ser = ARC2::getRDFJSONSerializer($this->a);
-    $dur = $r['query_time'];
-    $r = $ser->getSerializedIndex($index);
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }
-
-  function getPHPSERDescribeResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-  
-  function getPlainDescribeResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return print_r($r['result'], 1);
-  }
-
-  /* DUMP */
-  
-  function getDumpResultDoc() {
-    $this->headers = array();
-    return '';
-  }
-  
-  /* LOAD */
-  
-  function getLoadResultDoc($r) {
-    $formats = array(
-      'xml' => 'SPARQLXML', 'sparql-results+xml' => 'SPARQLXML', 
-      'json' => 'SPARQLJSON', 'sparql-results+json' => 'SPARQLJSON',
-      'plain' => 'Plain',
-      'php_ser' => 'PHPSER',
-      'sql' => ($this->allow_sql ? 'Plain' : 'xSQL'),
-      'infos' => 'Plain',
-    );
-    if ($f = $this->getResultFormat($formats, 'xml')) {
-      $m = 'get' . $f . 'LoadResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-
-  function getSPARQLXMLLoadResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+xml');
-    $r_val = $r['result']['t_count'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    return '' .
-      '<?xml version="1.0"?>' .
-      $nl . '<sparql xmlns="http://www.w3.org/2005/sparql-results#">' .
-      $nl . '  <head>' .
-      $nl . '    <!-- query time: '. round($dur, 4) .' sec -->' .
-      $nl . '  </head>' .
-      $nl . '  <inserted>' .$r_val. '</inserted>' .
-      $nl . '</sparql>' .
-    '';
-  }
-  
-  function getSPARQLJSONLoadResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+json');
-    $r_val = $r['result']['t_count'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    $r = '' .
-      $nl . '{' .
-      $nl . '  "head": {' .
-      $nl . '  },' .
-      $nl . '  "inserted" : ' . $r_val . 
-      $nl . '}' . 
-    '';
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }    
-  
-  function getPHPSERLoadResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-
-  function getPlainLoadResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return print_r($r['result'], 1);
-  }
-
-  /* DELETE */
-  
-  function getDeleteResultDoc($r) {
-    $formats = array(
-      'xml' => 'SPARQLXML', 'sparql-results+xml' => 'SPARQLXML', 
-      'json' => 'SPARQLJSON', 'sparql-results+json' => 'SPARQLJSON',
-      'plain' => 'Plain',
-      'php_ser' => 'PHPSER'
-    );
-    if ($f = $this->getResultFormat($formats, 'xml')) {
-      $m = 'get' . $f . 'DeleteResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-
-  function getSPARQLXMLDeleteResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+xml');
-    $r_val = $r['result']['t_count'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    return '' .
-      '<?xml version="1.0"?>' .
-      $nl . '<sparql xmlns="http://www.w3.org/2005/sparql-results#">' .
-      $nl . '  <head>' .
-      $nl . '    <!-- query time: '. round($dur, 4) .' sec -->' .
-      $nl . '  </head>' .
-      $nl . '  <deleted>' .$r_val. '</deleted>' .
-      $nl . '</sparql>' .
-    '';
-  }
-  
-  function getSPARQLJSONDeleteResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+json');
-    $r_val = $r['result']['t_count'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    $r = '' .
-      $nl . '{' .
-      $nl . '  "head": {' .
-      $nl . '  },' .
-      $nl . '  "deleted" : ' . $r_val . 
-      $nl . '}' . 
-    '';
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }    
-  
-  function getPHPSERDeleteResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-
-  function getPlainDeleteResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return print_r($r['result'], 1);
-  }
-
-  /* INSERT */
-  
-  function getInsertResultDoc($r) {
-    $formats = array(
-      'xml' => 'SPARQLXML', 'sparql-results+xml' => 'SPARQLXML', 
-      'json' => 'SPARQLJSON', 'sparql-results+json' => 'SPARQLJSON',
-      'plain' => 'Plain',
-      'php_ser' => 'PHPSER'
-    );
-    if ($f = $this->getResultFormat($formats, 'xml')) {
-      $m = 'get' . $f . 'InsertResultDoc';
-      return method_exists($this, $m) ? $this->$m($r) : 'not implemented';
-    }
-    return '';
-  }
-
-  function getSPARQLXMLInsertResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+xml');
-    $r_val = $r['result']['t_count'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    return '' .
-      '<?xml version="1.0"?>' .
-      $nl . '<sparql xmlns="http://www.w3.org/2005/sparql-results#">' .
-      $nl . '  <head>' .
-      $nl . '    <!-- query time: '. round($dur, 4) .' sec -->' .
-      $nl . '  </head>' .
-      $nl . '  <inserted>' .$r_val. '</inserted>' .
-      $nl . '</sparql>' .
-    '';
-  }
-  
-  function getSPARQLJSONInsertResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: application/sparql-results+json');
-    $r_val = $r['result']['t_count'];
-    $dur = $r['query_time'];
-    $nl = "\n";
-    $r = '' .
-      $nl . '{' .
-      $nl . '  "head": {' .
-      $nl . '  },' .
-      $nl . '  "inserted" : ' . $r_val . 
-      $nl . '}' . 
-    '';
-    if (($v = $this->p('jsonp')) || ($v = $this->p('callback'))) {
-      $r = $v . '(' . $r . ')';
-    }
-    return $r;
-  }    
-  
-  function getPHPSERInsertResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return serialize($r);
-  }
-
-  function getPlainInsertResultDoc($r) {
-    $this->setHeader('content-type', 'Content-Type: text/plain');
-    return print_r($r['result'], 1);
-  }
-
-  /*  */  
-  
-  function jsonEscape($v) {
-    if (function_exists('json_encode')) return trim(json_encode($v), '"');
-    $from = array("\\", "\r", "\t", "\n", '"', "\b", "\f", "/");
-    $to = array('\\\\', '\r', '\t', '\n', '\"', '\b', '\f', '\/');
-    return str_replace($from, $to, $v);
-  }
-    
-  /*  */
-
-  function getHTMLFormDoc() {
-    return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-      ' . $this->getHTMLDocHead() . '
-      ' . $this->getHTMLDocBody() . '
-      </html>
-    ';
-  }
-
-  function getHTMLDocHead() {
-    return '
-    	<head>
-    		<title>' . $this->getHTMLDocTitle() . '</title>
-    		<style type="text/css">
-        ' . $this->getHTMLDocCSS() . '
-    		</style>
-    	</head>
-    ';
-  }
-  
-  function getHTMLDocTitle() {
-    return $this->v('endpoint_title', 'ARC SPARQL+ Endpoint', $this->a);
-  }
-  
-  function getHTMLDocHeading() {
-    return $this->v('endpoint_heading', 'ARC SPARQL+ Endpoint (v' . ARC2::getVersion() . ')', $this->a);
-  }
-  
-  function getHTMLDocCSS() {
-    $default = '
-      body {
-        font-size: 14px;
-      	font-family: Trebuchet MS, Verdana, Geneva, sans-serif;
-        background: #fff url(?img=bg_body) top center repeat-x;
-        padding: 5px 20px 20px 20px;
-        color: #666;
-      }
-      h1 { font-size: 1.6em; font-weight: normal; }
-      a { color: #c00000; }
-      th, td {
-        border: 1px dotted #eee;
-        padding: 2px 4px; 
-      }
-      #sparql-form {
-        margin-bottom: 30px;
-      }
-      #query { 
-        float: left;
-        width: 60%;
-        display: block; 
-        height: 265px; 
-        margin-bottom: 10px;
-      }
-      .options {
-        float: right;
-        font-size: 0.9em;
-        width: 35%;
-        border-top: 1px solid #ccc;
-      }
-      .options h3 {
-        margin: 5px;
-      }
-      .options dl{
-        margin: 0px;
-        padding: 0px 10px 5px 20px;
-      }
-      .options dl dt {
-        border-top: 1px dotted #ddd;
-        padding-top: 10px;
-      }
-      .options dl dt.first {
-        border: none;
-      }
-      .options dl dd {
-        padding: 5px 0px 7px 0px;
-      }
-      .options-2 {
-        clear: both;
-        margin: 10px 0px;
-      }
-      .form-buttons {
-      }
-      .results {
-        border: 1px solid #eee;
-        padding: 5px;
-        background-color: #fcfcfc;
-      }
-    ';
-    return $this->v('endpoint_css', $default, $this->a);
-  }
-  
-  function getHTMLDocBody() {
-    return '
-    	<body>
-        <h1>' . $this->getHTMLDocHeading() . '</h1>
-        <div class="intro">
-          <p>
-            <a href="?">This interface</a> implements 
-            <a href="http://www.w3.org/TR/rdf-sparql-query/">SPARQL</a> and
-            <a href="http://arc.semsol.org/docs/v2/sparql+">SPARQL+</a> via <a href="http://www.w3.org/TR/rdf-sparql-protocol/#query-bindings-http">HTTP Bindings</a>. 
-          </p>
-          <p>
-            Enabled operations: ' . join(', ', $this->getFeatures()) . '
-          </p>
-          <p>
-            Max. number of results : ' . $this->v('endpoint_max_limit', '<em>unrestricted</em>', $this->a) . '
-          </p>
-        </div>
-        ' . $this->getHTMLDocForm() .'
-        ' . ($this->p('show_inline') ? $this->query_result : '') . '
-    	</body>
-    ';
-  }
-  
-  function getHTMLDocForm() {
-    $q = $this->p('query') ? htmlspecialchars($this->p('query')) : "SELECT * WHERE {\n  GRAPH ?g { ?s ?p ?o . }\n}\nLIMIT 10";
-    return '
-      <form id="sparql-form" action="?" enctype="application/x-www-form-urlencoded" method="' . ($_SERVER['REQUEST_METHOD'] == 'GET' ? 'get' : 'post' ) . '">
-        <textarea id="query" name="query" rows="20" cols="80">' . $q . '</textarea>
-        ' . $this->getHTMLDocOptions() . '
-        <div class="form-buttons">
-          <input type="submit" value="Send Query" />
-          <input type="reset" value="Reset" />
-        </div>
-      </form>
-    ';
-  }
-  
-  function getHTMLDocOptions() {
-    $sel = $this->p('output');
-    $sel_code = ' selected="selected"';
-    return '
-      <div class="options">
-        <h3>Options</h3>
-        <dl>
-          <dt class="first">Output format (if supported by query type):</dt>
-          <dd>
-            <select id="output" name="output">
-              <option value="" ' . (!$sel ? $sel_code : '') . '>default</option>
-              <option value="xml" ' . ($sel == 'xml' ? $sel_code : '') . '>XML</option>
-              <option value="json" ' . ($sel == 'json' ? $sel_code : '') . '>JSON</option>
-              <option value="plain" ' . ($sel == 'plain' ? $sel_code : '') . '>Plain</option>
-              <option value="php_ser" ' . ($sel == 'php_ser' ? $sel_code : '') . '>Serialized PHP</option>
-              <option value="turtle" ' . ($sel == 'turtle' ? $sel_code : '') . '>Turtle</option>
-              <option value="rdfxml" ' . ($sel == 'rdfxml' ? $sel_code : '') . '>RDF/XML</option>
-              <option value="infos" ' . ($sel == 'infos' ? $sel_code : '') . '>Query Structure</option>
-              ' . ($this->allow_sql ? '<option value="sql" ' . ($sel == 'sql' ? $sel_code : '') . '>SQL</option>' : '') . '
-              <option value="htmltab" ' . ($sel == 'htmltab' ? $sel_code : '') . '>HTML Table</option>
-              <option value="tsv" ' . ($sel == 'tsv' ? $sel_code : '') . '>TSV</option>
-            </select>
-          </dd>
-          
-          <dt>jsonp/callback (for JSON results)</dt>
-          <dd>
-            <input type="text" id="jsonp" name="jsonp" value="' . htmlspecialchars($this->p('jsonp')) . '" />
-          </dd>
-          
-          <dt>API key (if required)</dt>
-          <dd>
-            <input type="text" id="key" name="key" value="' . htmlspecialchars($this->p('key')) . '" />
-          </dd>
-          
-          <dt>Show results inline: </dt>
-          <dd>
-            <input type="checkbox" name="show_inline" value="1" ' . ($this->p('show_inline') ? ' checked="checked"' : '') . ' />
-          </dd>
-          
-        </dl>
-      </div>
-      <div class="options-2">
-        Change HTTP method: 
-            <a href="javascript:;" onclick="javascript:document.getElementById(\'sparql-form\').method=\'get\'">GET</a> 
-            <a href="javascript:;" onclick="javascript:document.getElementById(\'sparql-form\').method=\'post\'">POST</a> 
-       </div>
-    ';
-  }
-  
-  /*  */
-  
-}
diff --git a/libraries/ARC2/store/ARC2_StoreHelper.php b/libraries/ARC2/store/ARC2_StoreHelper.php
deleted file mode 100644
index 32277dc1c..000000000
--- a/libraries/ARC2/store/ARC2_StoreHelper.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDF Store Helper
-author:   Benjamin Nowack
-version:  2008-04-03 (Tweak: Changed locking approach from "LOCK TABLE" to "GET LOCK")
-*/
-
-ARC2::inc('Class');
-
-class ARC2_StoreHelper extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-  }
-
-  /*  */
-
-  function changeNamespaceURI($old_uri, $new_uri) {
-    $id_changes = 0;
-    $t_changes = 0;
-    /* table lock */
-    if ($this->store->getLock()) {
-      $con = $this->store->getDBCon();
-      foreach (array('id', 's', 'o') as $id_col) {
-        $tbl = $this->store->getTablePrefix() . $id_col . '2val';
-        $sql = 'SELECT id, val FROM ' . $tbl . ' WHERE val LIKE "' . mysql_real_escape_string($old_uri, $con). '%"';
-        $rs = mysql_query($sql, $con);
-        if (!$rs) continue;
-        while ($row = mysql_fetch_array($rs)) {
-          $new_val = str_replace($old_uri, $new_uri, $row['val']);
-          $new_id = $this->store->getTermID($new_val, $id_col);
-          if (!$new_id) {/* unknown ns uri, overwrite current id value */
-            $sub_sql = "UPDATE " . $tbl . " SET val = '" . mysql_real_escape_string($new_val, $con) . "' WHERE id = " . $row['id'];
-            $sub_r = mysql_query($sub_sql, $con);
-            $id_changes++;
-          }
-          else {/* replace ids */
-            $t_tbls = $this->store->getTables();
-            foreach ($t_tbls as $t_tbl) {
-              if (preg_match('/^triple/', $t_tbl)) {
-                foreach (array('s', 'p', 'o', 'o_lang_dt') as $t_col) {
-                  $sub_sql = "UPDATE " . $this->store->getTablePrefix() . $t_tbl . " SET " . $t_col . " = " . $new_id . " WHERE " . $t_col . " = " . $row['id'];
-                  $sub_r = mysql_query($sub_sql, $con);
-                  $t_changes += mysql_affected_rows($con);
-                }
-              }
-            }
-          }
-        }
-      }
-      $this->store->releaseLock();
-    }
-    return array('id_replacements' => $id_changes, 'triple_updates' => $t_changes);
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreInsertQueryHandler.php b/libraries/ARC2/store/ARC2_StoreInsertQueryHandler.php
deleted file mode 100644
index 464b9adfc..000000000
--- a/libraries/ARC2/store/ARC2_StoreInsertQueryHandler.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 RDF Store INSERT Query Handler
-author:   Benjamin Nowack
-version:  2007-09-11 (Fix: empty CONSTRUCT results were not caught, which led to a GET in LOAD
-                      Tweak: INSERT CONSTRUCT will keep bnode ids unchanged)
-*/
-
-ARC2::inc('StoreQueryHandler');
-
-class ARC2_StoreInsertQueryHandler extends ARC2_StoreQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-  }
-
-  /*  */
-  
-  function runQuery($infos, $keep_bnode_ids = 0) {
-    $this->infos = $infos;
-    $con = $this->store->getDBCon();
-    /* insert */
-    if (!$this->v('pattern', array(), $this->infos['query'])) {
-      return $this->store->insert($this->infos['query']['construct_triples'], $this->infos['query']['target_graph'], $keep_bnode_ids);
-    }
-    else {
-      $keep_bnode_ids = 1;
-      ARC2::inc('StoreConstructQueryHandler');
-      $h = new ARC2_StoreConstructQueryHandler($this->a, $this->store);
-      if ($sub_r = $h->runQuery($this->infos)) {
-        return $this->store->insert($sub_r, $this->infos['query']['target_graph'], $keep_bnode_ids);
-      }
-      return array('t_count' => 0, 'load_time' => 0);
-    }
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreLoadQueryHandler.php b/libraries/ARC2/store/ARC2_StoreLoadQueryHandler.php
deleted file mode 100644
index 2bd74cc76..000000000
--- a/libraries/ARC2/store/ARC2_StoreLoadQueryHandler.php
+++ /dev/null
@@ -1,459 +0,0 @@
-<?php
-/**
- * ARC2 RDF Store LOAD Query Handler
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-06-24
-*/
-
-ARC2::inc('StoreQueryHandler');
-
-class ARC2_StoreLoadQueryHandler extends ARC2_StoreQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con, store_log_inserts */
-    parent::__init();
-    $this->store = $this->caller;
-    $this->write_buffer_size = $this->v('store_write_buffer', 2500, $this->a);
-    $this->split_threshold = $this->v('store_split_threshold', 0, $this->a);
-    $this->has_pcre_unicode = @preg_match('/\pL/u', 'test');
-    $this->strip_mb_comp_str = $this->v('store_strip_mb_comp_str', 0, $this->a);
-  }
-
-  /*  */
-  
-  function runQuery($infos, $data = '', $keep_bnode_ids = 0) {
-    $url = $infos['query']['url'];
-    $graph = $infos['query']['target_graph'];
-    $this->target_graph = $graph ? $this->calcURI($graph) : $this->calcURI($url);
-    $this->fixed_target_graph = $graph ? $this->target_graph : '';
-    $this->keep_bnode_ids = $keep_bnode_ids;
-    /* reader */
-    ARC2::inc('Reader');
-    $reader = new ARC2_Reader($this->a, $this);
-    $reader->activate($url, $data);
-    /* format detection */
-    $mappings = array(
-      'rdfxml' => 'RDFXML', 
-      'sparqlxml' => 'SPOG', 
-      'turtle' => 'Turtle', 
-      'ntriples' => 'Turtle', 
-      'rss' => 'RSS',
-      'atom' => 'Atom',
-      'n3' => 'Turtle', 
-      'html' => 'SemHTML',
-      'sgajson' => 'SGAJSON',
-      'cbjson' => 'CBJSON'
-    );
-    $format = $reader->getFormat();
-    if (!$format || !isset($mappings[$format])) {
-      return $this->addError('No loader available for "' .$url. '": ' . $format);
-    }
-    /* format loader */
-    $suffix = 'Store' . $mappings[$format] . 'Loader';
-    ARC2::inc($suffix);
-    $cls = 'ARC2_' . $suffix;
-    $loader = new $cls($this->a, $this);
-    $loader->setReader($reader);
-    /* lock */
-    if (!$this->store->getLock()) {
-      $l_name = $this->a['db_name'] . '.' . $this->store->getTablePrefix() . '.write_lock';
-      return $this->addError('Could not get lock in "runQuery" (' . $l_name . ')');
-    }
-    $this->has_lock = 1;
-    /* logging */
-    $this->t_count = 0;
-    $this->t_start = ARC2::mtime();
-    $this->log_inserts = $this->v('store_log_inserts', 0, $this->a);
-    if ($this->log_inserts) {
-      @unlink("arc_insert_log.txt");
-      $this->inserts = array();
-      $this->insert_times = array();
-      $this->t_prev = $this->t_start;
-      $this->t_count_prev = 0 ;
-    }
-    /* load and parse */
-    $this->max_term_id = $this->getMaxTermID();
-    $this->max_triple_id = $this->getMaxTripleID();
-    $this->column_type = $this->store->getColumnType();
-    //$this->createMergeTable();
-    $this->term_ids = array();
-    $this->triple_ids = array();
-    $this->sql_buffers = array();
-    $r = $loader->parse($url, $data);
-    /* done */
-    $this->checkSQLBuffers(1);
-    if ($this->log_inserts) {
-      $this->logInserts();
-    }
-    $this->store->releaseLock();
-    //$this->dropMergeTable();
-    if ((rand(1, 100) == 1)) $this->store->optimizeTables();
-    $t2 = ARC2::mtime();
-    $dur = round($t2 - $this->t_start, 4);
-    $r = array(
-      't_count' => $this->t_count,
-      'load_time' => $dur,
-    );
-    if ($this->log_inserts) {
-      $r['inserts'] = $this->inserts;
-      $r['insert_times'] = $this->insert_times;
-    }
-    return $r;
-  }
-  
-  /*  */
-
-  function addT($s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '') {
-    if (!$this->has_lock) return 0;
-    $type_ids = array ('uri' => '0', 'bnode' => '1' , 'literal' => '2');
-    $g = $this->getStoredTermID($this->target_graph, '0', 'id');
-    $s = (($s_type == 'bnode') && !$this->keep_bnode_ids) ? '_:b' . abs(crc32($g . $s)) . '_' . (strlen($s) > 12 ? substr(substr($s, 2) , -10) : substr($s, 2)) : $s;
-    $o = (($o_type == 'bnode') && !$this->keep_bnode_ids) ? '_:b' . abs(crc32($g . $o)) . '_' . (strlen($o) > 12 ? substr(substr($o, 2), -10) : substr($o, 2)) : $o;
-    /* triple */
-    $t = array(
-      's' => $this->getStoredTermID($s, $type_ids[$s_type], 's'),
-      'p' => $this->getStoredTermID($p, '0', 'id'),
-      'o' => $this->getStoredTermID($o, $type_ids[$o_type], 'o'),
-      'o_lang_dt' => $this->getStoredTermID($o_dt . $o_lang, $o_dt ? '0' : '2', 'id'),
-      'o_comp' => $this->getOComp($o),
-      's_type' => $type_ids[$s_type], 
-      'o_type' => $type_ids[$o_type],
-    );
-    $t['t'] = $this->getTripleID($t);
-    if (is_array($t['t'])) {/* t exists already */
-      $t['t'] = $t['t'][0];
-    }
-    else {
-      $this->bufferTripleSQL($t);
-    }
-    /* g2t */
-    $g2t = array('g' => $g, 't' => $t['t']);
-    $this->bufferGraphSQL($g2t);
-    $this->t_count++;
-    /* check buffers */
-    if (($this->t_count % $this->write_buffer_size) == 0) {
-      $force_write = 1;
-      $reset_buffers = (($this->t_count % ($this->write_buffer_size * 2)) == 0);
-      $refresh_lock = (($this->t_count % 25000) == 0);
-      $split_tables = (($this->t_count % ($this->write_buffer_size * 10)) == 0);
-      if ($this->log_inserts) $this->logInserts();
-      $this->checkSQLBuffers($force_write, $reset_buffers, $refresh_lock, $split_tables);
-    }
-  }
-
-  /*  */
-  
-  function getMaxTermID() {
-    $con = $this->store->getDBCon();
-    $sql = '';
-    foreach (array('id2val', 's2val', 'o2val') as $tbl) {
-      $sql .= $sql ? ' UNION ' : '';
-      $sql .= "(SELECT MAX(id) as `id` FROM " . $this->store->getTablePrefix() . $tbl . ')';
-    }
-    $r = 0;
-    if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs)) {
-      while ($row = mysql_fetch_array($rs)) {
-        $r = ($r < $row['id']) ? $row['id'] : $r;
-      }
-    }
-    return $r + 1;
-  }
-  
-  function getMaxTripleID() {
-    $con = $this->store->getDBCon();
-    $sql = "SELECT MAX(t) AS `id` FROM " . $this->store->getTablePrefix() . "triple";
-    if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs) && ($row = mysql_fetch_array($rs))) {
-      return $row['id'] + 1;
-    }
-    return 1;
-  }
-
-  function getStoredTermID($val, $type_id, $tbl) {
-    $con = $this->store->getDBCon();
-    /* buffered */
-    if (isset($this->term_ids[$val])) {
-      if (!isset($this->term_ids[$val][$tbl])) {
-        foreach (array('id', 's', 'o') as $other_tbl) {
-          if (isset($this->term_ids[$val][$other_tbl])) {
-            $this->term_ids[$val][$tbl] = $this->term_ids[$val][$other_tbl];
-            $this->bufferIDSQL($tbl, $this->term_ids[$val][$tbl], $val, $type_id);
-            break;
-          }
-        }
-      }
-      return $this->term_ids[$val][$tbl];
-    }
-    /* db */
-    $tbl_prefix = $this->store->getTablePrefix();
-    $sub_tbls = ($tbl == 'id') ? array('id2val', 's2val', 'o2val') : ($tbl == 's' ? array('s2val', 'id2val', 'o2val') : array('o2val', 'id2val', 's2val'));
-    foreach ($sub_tbls as $sub_tbl) {
-      $id = 0;
-      //$sql = "SELECT id AS `id`, '" . $sub_tbl . "' AS `tbl` FROM " . $tbl_prefix . $sub_tbl . " WHERE val = BINARY '" . mysql_real_escape_string($val, $con) . "'";
-      /* via hash */
-      if (preg_match('/^(s2val|o2val)$/', $sub_tbl) && $this->hasHashColumn($sub_tbl)) {
-        $sql = "SELECT id AS `id`, val AS `val` FROM " . $tbl_prefix . $sub_tbl . " WHERE val_hash = BINARY '" . $this->getValueHash($val) . "'";
-        if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs)) {
-          while ($row = mysql_fetch_array($rs)) {
-            if ($row['val'] == $val) {
-              $id = $row['id'];
-              break;
-            }
-          }
-        }
-      }
-      else {
-        $sql = "SELECT id AS `id` FROM " . $tbl_prefix . $sub_tbl . " WHERE val = BINARY '" . mysql_real_escape_string($val, $con) . "'";
-        if (($rs = $this->queryDB($sql . ' LIMIT 1', $con)) && mysql_num_rows($rs)) {
-          $row = mysql_fetch_array($rs);
-          $id = $row['id'];
-        }
-      }
-      if ($id) {
-        $this->term_ids[$val] = array($tbl => $id);
-        if ($sub_tbl != $tbl . '2val') {
-          $this->bufferIDSQL($tbl, $id, $val, $type_id);
-        }
-        break;
-      }
-    }
-    /* new */
-    if (!isset($this->term_ids[$val])) {
-      $this->term_ids[$val] = array($tbl => $this->max_term_id);
-      $this->bufferIDSQL($tbl, $this->max_term_id, $val, $type_id);
-      $this->max_term_id++;
-      /* upgrade tables ? */
-      if (($this->column_type == 'mediumint') && ($this->max_term_id >= 16750000)) {
-        $this->store->extendColumns();
-        $this->column_type = 'int';
-      }
-    }
-    return $this->term_ids[$val][$tbl];
-  }
-
-  function getTripleID($t) {
-    $con = $this->store->getDBCon();
-    $val = serialize($t);
-    /* buffered */
-    if (isset($this->triple_ids[$val])) {
-      return array($this->triple_ids[$val]);/* hack for "don't insert this triple" */
-    }
-    /* db */
-    $sql = "SELECT t FROM " . $this->store->getTablePrefix() . "triple WHERE 
-      s = " . $t['s'] . " AND p = " . $t['p'] . " AND o = " . $t['o'] . " AND o_lang_dt = " . $t['o_lang_dt'] . " AND s_type = " . $t['s_type'] . " AND o_type = " . $t['o_type'] . "
-      LIMIT 1
-    ";
-    if (($rs = $this->queryDB($sql, $con)) && mysql_num_rows($rs) && ($row = mysql_fetch_array($rs))) {
-      $this->triple_ids[$val] = $row['t'];/* hack for "don't insert this triple" */
-      return array($row['t']);/* hack for "don't insert this triple" */
-    }
-    /* new */
-    else {
-      $this->triple_ids[$val] = $this->max_triple_id;
-      $this->max_triple_id++;
-      /* split tables ? */
-      if ($this->split_threshold && !($this->max_triple_id % $this->split_threshold)) {
-        $this->store->splitTables();
-        $this->dropMergeTable();
-        $this->createMergeTable();
-      }
-      return $this->triple_ids[$val];
-    }
-  }
-  
-  function getOComp($val) {
-    /* try date (e.g. 21 August 2007) */
-    if (preg_match('/^[0-9]{1,2}\s+[a-z]+\s+[0-9]{4}/i', $val) && ($uts = strtotime($val)) && ($uts !== -1)) {
-      return date("Y-m-d\TH:i:s", $uts);
-    }
-    /* xsd date (e.g. 2009-05-28T18:03:38+09:00 2009-05-28T18:03:38GMT) */
-    if (preg_match('/^([0-9]{4}\-[0-9]{2}\-[0-9]{2}\T)([0-9\:]+)?([0-9\+\-\:\Z]+)?(\s*[a-z]{2,3})?$/si', $val, $m)) {
-      /* yyyy-mm-dd */
-      $val = $m[1];
-      /* hh:ss */
-      if ($m[2]) {
-        $val .= $m[2];
-        /* timezone offset */
-        if (isset($m[3]) && ($m[3] != 'Z')) {
-          $uts = strtotime(str_replace('T', ' ', $val));
-          if (preg_match('/([\+\-])([0-9]{2})\:?([0-9]{2})$/', $m[3], $sub_m)) {
-            $diff_mins = (3600 * ltrim($sub_m[2], '0')) + ltrim($sub_m[3], '0');
-            $uts = ($sub_m[1] == '-') ? $uts + $diff_mins : $uts - $diff_mins;
-            $val = date('Y-m-d\TH:i:s\Z', $uts);
-          }
-        }
-        else {
-          $val .= 'Z';
-        }
-      }
-      return $val;
-    }
-    /* fallback & backup w/o UTC calculation, to be removed in later revision */
-    if (preg_match('/^[0-9]{4}[0-9\-\:\T\Z\+]+([a-z]{2,3})?$/i', $val)) {
-      return $val;
-    }
-    if (is_numeric($val)) {
-      $val = sprintf("%f", $val);
-      if (preg_match("/([\-\+])([0-9]*)\.([0-9]*)/", $val, $m)) {
-        return $m[1] . sprintf("%018s", $m[2]) . "." . sprintf("%-015s", $m[3]);
-      }
-      if (preg_match("/([0-9]*)\.([0-9]*)/", $val, $m)) {
-        return "+" . sprintf("%018s", $m[1]) . "." . sprintf("%-015s", $m[2]);
-      }
-      return $val;
-    }
-    /* any other string: remove tags, linebreaks etc., but keep MB-chars  */
-    //$val = substr(trim(preg_replace('/[\W\s]+/is', '-', strip_tags($val))), 0, 35);
-    $re = $this->has_pcre_unicode ? '/[\PL\s]+/isu' : '/[\s\'\"\´\`]+/is';
-    $val = trim(preg_replace($re, '-', strip_tags($val)));
-    if (strlen($val) > 35) {
-      $fnc = function_exists("mb_substr") ? 'mb_substr' : 'substr';
-      $val = $fnc($val, 0, 17) . '-' . $fnc($val, -17);
-    }
-    if ($this->strip_mb_comp_str) {
-      $val = urldecode(preg_replace('/\%[0-9A-F]{2}/', '', urlencode($val)));
-    }
-    return $this->toUTF8($val);
-  }
-
-  /*  */
-  
-  function bufferTripleSQL($t) {
-    $con = $this->store->getDBCon();
-    $tbl = 'triple';
-    $sql = ", ";
-    if (!isset($this->sql_buffers[$tbl])) {
-      $this->sql_buffers[$tbl] = "INSERT IGNORE INTO " . $this->store->getTablePrefix() . $tbl . " (t, s, p, o, o_lang_dt, o_comp, s_type, o_type) VALUES";
-      $sql = " ";
-    }
-    $this->sql_buffers[$tbl] .= $sql . "(" . $t['t'] . ", " . $t['s'] . ", " . $t['p'] . ", " . $t['o'] . ", " . $t['o_lang_dt'] . ", '" . mysql_real_escape_string($t['o_comp'], $con) . "', " . $t['s_type'] . ", " . $t['o_type'] . ")";
-  }
-  
-  function bufferGraphSQL($g2t) {
-    $tbl = 'g2t';
-    $sql = ", ";
-    if (!isset($this->sql_buffers[$tbl])) {
-      $this->sql_buffers[$tbl] = "INSERT IGNORE INTO " . $this->store->getTablePrefix() . $tbl . " (g, t) VALUES";
-      $sql = " ";
-    }
-    $this->sql_buffers[$tbl] .= $sql . "(" . $g2t['g'] . ", " . $g2t['t'] . ")";
-  }
-  
-  function bufferIDSQL($tbl, $id, $val, $val_type) {
-    $con = $this->store->getDBCon();
-    $tbl = $tbl . '2val';
-    if ($tbl == 'id2val') {
-      $cols = "id, val, val_type";
-      $vals = "(" . $id . ", '" . mysql_real_escape_string($val, $con) . "', " . $val_type . ")";
-    }
-    elseif (preg_match('/^(s2val|o2val)$/', $tbl) && $this->hasHashColumn($tbl)) {
-      $cols = "id, val_hash, val";
-      $vals = "(" . $id . ", '" . $this->getValueHash($val). "', '" . mysql_real_escape_string($val, $con) . "')";
-    }
-    else {
-      $cols = "id, val";
-      $vals = "(" . $id . ", '" . mysql_real_escape_string($val, $con) . "')";
-    }
-    if (!isset($this->sql_buffers[$tbl])) {
-      $this->sql_buffers[$tbl] = '';
-      $sql = "INSERT IGNORE INTO " . $this->store->getTablePrefix() . $tbl . "(" . $cols . ") VALUES ";
-    }
-    else {
-      $sql = ", ";
-    }
-    $sql .= $vals;
-    $this->sql_buffers[$tbl] .= $sql;
-  }
-  
-  /*  */
-
-  function checkSQLBuffers($force_write = 0, $reset_id_buffers = 0, $refresh_lock = 0, $split_tables = 0) {
-    $con = $this->store->getDBCon();
-    if (!$this->keep_time_limit) @set_time_limit($this->v('time_limit', 60, $this->a));
-    foreach (array('triple', 'g2t', 'id2val', 's2val', 'o2val') as $tbl) {
-      $buffer_size = isset($this->sql_buffers[$tbl]) ? 1 : 0;
-      if ($buffer_size && $force_write) {
-        $t1 = ARC2::mtime();
-        $this->queryDB($this->sql_buffers[$tbl], $con);
-        /* table error */
-        if ($er = mysql_error($con)) {
-          $this->autoRepairTable($er, $con, $this->sql_buffers[$tbl]);
-        }
-        unset($this->sql_buffers[$tbl]);
-        if ($this->log_inserts) {
-          $t2 = ARC2::mtime();
-          $this->inserts[$tbl] = $this->v($tbl, 0, $this->inserts) + max(0, mysql_affected_rows($con));
-          $dur = round($t2 - $t1, 4);
-          $this->insert_times[$tbl] = isset($this->insert_times[$tbl]) ? $this->insert_times[$tbl] : array('min' => $dur, 'max' => $dur, 'sum' => $dur);
-          $this->insert_times[$tbl] = array('min' => min($dur, $this->insert_times[$tbl]['min']), 'max' => max($dur, $this->insert_times[$tbl]['max']), 'sum' => $dur + $this->insert_times[$tbl]['sum']);
-        }
-        /* reset term id buffers */
-        if ($reset_id_buffers) {
-          $this->term_ids = array();
-          $this->triple_ids = array();
-        }
-        /* refresh lock */
-        if ($refresh_lock) {
-          $this->store->releaseLock();
-          $this->has_lock = 0;
-          sleep(1);
-          if (!$this->store->getLock(5)) return $this->addError('Could not re-obtain lock in "checkSQLBuffers"');
-          $this->has_lock = 1;
-        }
-      }
-    }
-    return 1;
-  }
-
-  function autoRepairTable($er, $con, $sql = '') {
-    $this->addError('MySQL error: ' . $er . ' (' . $sql . ')');
-    if (preg_match('/Table \'[^\']+\/([a-z0-9\_\-]+)\' .*(crashed|repair)/i', $er, $m)) {
-      $rs = $this->queryDB('REPAIR TABLE ' . rawurlencode($m[1]), $con);
-      $msg = $rs ? mysql_fetch_array($rs) : array();
-      if ($this->v('Msg_type', 'error', $msg) == 'error') {
-        /* auto-reset */
-        if ($this->v('store_reset_on_table_crash', 0, $this->a)) {
-          $this->store->drop();
-          $this->store->setUp();
-        }
-        else {
-          $er = $this->v('Msg_text', 'unknown error', $msg);
-          $this->addError('Auto-repair failed on ' . rawurlencode($m[1]) . ': ' . $er);
-        }
-        //die("Fatal errors: \n" . print_r($this->getErrors(), 1));
-      }
-    }
-  }
-
-  /* speed log */
-  
-  function logInserts() {
-    $t_start = $this->t_start;
-    $t_prev = $this->t_prev;
-    $t_now = ARC2::mtime();
-    $tc_prev = $this->t_count_prev;
-    $tc_now = $this->t_count;
-    $tc_diff = $tc_now - $tc_prev;
-    
-    $dur_full = $t_now - $t_start;
-    $dur_diff = $t_now - $t_prev;
-
-    $speed_full = round($tc_now / $dur_full);
-    $speed_now = round($tc_diff / $dur_diff);
-
-    $r = $tc_diff . ' in ' . round($dur_diff, 5) . ' = ' . $speed_now . ' t/s  (' .$tc_now. ' in ' . round($dur_full, 5). ' = ' . $speed_full . ' t/s )'; 
-    $fp = @fopen("arc_insert_log.txt", "a");
-    @fwrite($fp, $r . "\r\n");
-    @fclose($fp);
-    
-    $this->t_prev = $t_now;
-    $this->t_count_prev = $tc_now;
-  }
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreQueryHandler.php b/libraries/ARC2/store/ARC2_StoreQueryHandler.php
deleted file mode 100644
index 69189b16b..000000000
--- a/libraries/ARC2/store/ARC2_StoreQueryHandler.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * ARC2 RDF Store Query Handler
- *
- * @author Benjamin Nowack
- * @license <http://arc.semsol.org/license>
- * @homepage <http://arc.semsol.org/>
- * @package ARC2
- * @version 2010-04-11
-*/
-
-ARC2::inc('Class');
-
-class ARC2_StoreQueryHandler extends ARC2_Class {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->xsd = 'http://www.w3.org/2001/XMLSchema#';
-    $this->allow_extension_functions = $this->v('store_allow_extension_functions', 1, $this->a);    
-    $this->keep_time_limit = $this->v('keep_time_limit', 0, $this->a);
-    $this->handler_type = '';
-  }
-
-  /*  */
-
-  function getTermID($val, $term = '') {
-    return $this->store->getTermID($val, $term);
-  }
-
-  function hasHashColumn($tbl) {
-    return $this->store->hasHashColumn($tbl);
-  }
-
-  function getValueHash($val) {
-    return $this->store->getValueHash($val);
-  }
-  
-  /*  */
-
-  function getTripleTable() {
-    $r = $this->store->getTablePrefix() . 'triple';
-    return $r;
-  }
-
-  /*  */
-
-  function createMergeTable() {
-    $split_ps = $this->store->getSetting('split_predicates', array());
-    if (!$split_ps) return 1;
-    $this->mrg_table_id = 'MRG_' . $this->store->getTablePrefix() . crc32(uniqid(rand()));
-    $con = $this->store->getDBCon();
-    $this->queryDB("FLUSH TABLES", $con);
-    $indexes = $this->v('store_indexes', array('sp (s,p)', 'os (o,s)', 'po (p,o)'), $this->a);
-    $index_code = $indexes ? 'KEY ' . join(', KEY ',  $indexes) . ', ' : '';
-    $prefix = $this->store->getTablePrefix();
-    $sql = "
-      CREATE TEMPORARY TABLE IF NOT EXISTS " . $prefix . "triple_all (
-        t mediumint UNSIGNED NOT NULL,
-        s mediumint UNSIGNED NOT NULL,
-        p mediumint UNSIGNED NOT NULL,
-        o mediumint UNSIGNED NOT NULL,
-        o_lang_dt mediumint UNSIGNED NOT NULL,
-        o_comp char(35) NOT NULL,                   /* normalized value for ORDER BY operations */
-        s_type tinyint(1) NOT NULL default 0,       /* uri/bnode => 0/1 */
-        o_type tinyint(1) NOT NULL default 0,       /* uri/bnode/literal => 0/1/2 */
-        misc tinyint(1) NOT NULL default 0,         /* temporary flags */
-        UNIQUE KEY (t), " . $index_code . " KEY (misc)
-      ) 
-    ";
-    $v = $this->store->getDBVersion();
-    $sql .= (($v < '04-01-00') && ($v >= '04-00-18')) ? 'ENGINE' : (($v >= '04-01-02') ? 'ENGINE' : 'TYPE');
-    $sql .= "=MERGE UNION=(" . $prefix . "triple" ;
-    foreach ($split_ps as $pos => $p) {
-      $sql .= ',' . $prefix . 'triple_' . abs(crc32($p));
-    }
-    $sql .= ")";
-    //$sql .= ($v >= '04-00-00') ? " CHARACTER SET utf8" : "";
-    //$sql .= ($v >= '04-01-00') ? " COLLATE utf8_unicode_ci" : "";
-    //echo $sql;
-    return $this->queryDB($sql, $con);
-  }
-
-  function dropMergeTable() {
-    return 1;
-    $sql = "DROP TABLE IF EXISTS " . $this->store->getTablePrefix() . "triple_all";
-    //echo $sql;
-    return $this->queryDB($sql, $this->store->getDBCon());
-  }
-  
-}
diff --git a/libraries/ARC2/store/ARC2_StoreRDFXMLLoader.php b/libraries/ARC2/store/ARC2_StoreRDFXMLLoader.php
deleted file mode 100644
index 17e6727c0..000000000
--- a/libraries/ARC2/store/ARC2_StoreRDFXMLLoader.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store RDF/XML Loader
-author:   Benjamin Nowack
-version:  2007-08-21
-*/
-
-ARC2::inc('RDFXMLParser');
-
-class ARC2_StoreRDFXMLLoader extends ARC2_RDFXMLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function addT($s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '') {
-    $this->caller->addT($s, $p, $o, $s_type, $o_type, $o_dt, $o_lang);
-    $this->t_count++;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreRSSLoader.php b/libraries/ARC2/store/ARC2_StoreRSSLoader.php
deleted file mode 100644
index b4cddcb06..000000000
--- a/libraries/ARC2/store/ARC2_StoreRSSLoader.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store RSS(2) Loader
-author:   Benjamin Nowack
-version:  2008-06-28 (Tweak: adjusted to normalized "literal" type)
-*/
-
-ARC2::inc('RSSParser');
-
-class ARC2_StoreRSSLoader extends ARC2_RSSParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function addT($t) {
-    $this->caller->addT($t['s'], $t['p'], $t['o'], $t['s_type'], $t['o_type'], $t['o_datatype'], $t['o_lang']);
-    $this->t_count++;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreSGAJSONLoader.php b/libraries/ARC2/store/ARC2_StoreSGAJSONLoader.php
deleted file mode 100644
index d4947d763..000000000
--- a/libraries/ARC2/store/ARC2_StoreSGAJSONLoader.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store SG API JSON Loader
-author:   Benjamin Nowack
-version:  2008-07-15
-*/
-
-ARC2::inc('SGAJSONParser');
-
-class ARC2_StoreSGAJSONLoader extends ARC2_SGAJSONParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function done() {
-    $this->extractRDF();
-  }
-  
-  function addT($s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '') {
-    $this->caller->addT($s, $p, $o, $s_type, $o_type, $o_dt, $o_lang);
-    $this->t_count++;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreSPOGLoader.php b/libraries/ARC2/store/ARC2_StoreSPOGLoader.php
deleted file mode 100644
index f2d0ae29c..000000000
--- a/libraries/ARC2/store/ARC2_StoreSPOGLoader.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store SPOG Loader
-author:   Morten H�ybye Frederiksen / Benjamin Nowack
-version:  2008-07-02
-*/
-
-ARC2::inc('SPOGParser');
-
-class ARC2_StoreSPOGLoader extends ARC2_SPOGParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function addT($s, $p, $o, $s_type, $o_type, $o_dt = '', $o_lang = '', $g) {
-    if (!($s && $p && $o)) return 0;
-    if (!$g) $g = $this->caller->target_graph;
-    if ($this->caller->fixed_target_graph) $g = $this->caller->fixed_target_graph;
-    $prev_g = $this->caller->target_graph;
-    $this->caller->target_graph = $g;
-    $this->caller->addT($s, $p, $o, $s_type, $o_type, $o_dt, $o_lang);
-    $this->caller->target_graph = $prev_g;
-    $this->t_count++;
-  }
-  
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreSelectQueryHandler.php b/libraries/ARC2/store/ARC2_StoreSelectQueryHandler.php
deleted file mode 100644
index 17a64950d..000000000
--- a/libraries/ARC2/store/ARC2_StoreSelectQueryHandler.php
+++ /dev/null
@@ -1,1824 +0,0 @@
-<?php
-/**
- * ARC2 RDF Store SELECT Query Handler
- *
- * @author    Benjamin Nowack
- * @license   http://arc.semsol.org/license
- * @homepage  <http://arc.semsol.org/>
- * @package   ARC2
- * @version   2010-06-22
- *
-*/
-
-ARC2::inc('StoreQueryHandler');
-
-class ARC2_StoreSelectQueryHandler extends ARC2_StoreQueryHandler {
-
-  function __construct($a = '', &$caller) {/* caller has to be a store */
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->store = $this->caller;
-    $con = $this->store->getDBCon();
-    $this->handler_type = 'select';
-    $this->engine_type = $this->v('store_engine_type', 'MyISAM', $this->a);
-    $this->cache_results = $this->v('store_cache_results', 0, $this->a);
-  }
-
-  /*  */
-
-  function runQuery($infos) {
-    $con = $this->store->getDBCon();
-    $rf = $this->v('result_format', '', $infos);
-    $this->infos = $infos;
-    $this->infos['null_vars'] = array();
-    $this->indexes = array();
-    $this->pattern_order_offset = 0;
-    $q_sql = $this->validateSqlQuery($this->getSQL());
-
-    /* debug result formats */
-    if ($rf == 'sql') return $q_sql;
-    if ($rf == 'structure') return $this->infos;
-    if ($rf == 'index') return $this->indexes;
-    /* create intermediate results (ID-based) */
-    $tmp_tbl = $this->createTempTable($q_sql);
-
-    /* join values */
-    $r = $this->getFinalQueryResult($q_sql, $tmp_tbl);
-    /* remove intermediate results */
-    if (!$this->cache_results) {
-      $this->queryDB('DROP TABLE IF EXISTS ' . $tmp_tbl, $con);
-    }
-    return $r;
-  }
-
-  /*
-   * workaround replaces the first LEFT JOIN with
-   * a FROM in a SELECT-query without a FROM
-   */
-  function validateSqlQuery($sql){
-      if(strpos($sql,"FROM") == false){
-          if(strpos($sql,"JOIN") != false){
-              try{
-                  $tmp = preg_split("#LEFT JOIN#", $sql);
-                  $select = $tmp[0];
-                  $from  = $tmp[1];
-                  $query_exclude_select = "";
-                  for($i = 2; $i < sizeof($tmp); $i++)
-                  {
-                      $query_exclude_select .= " LEFT JOIN ".$tmp[$i];
-                  }
-                  $tmp = preg_split("#ON#", $from);
-                  $from = $tmp[0];
-                  return $select."FROM ".$from." ".$query_exclude_select;
-              }
-              catch(Exception $e){
-                  $this->addError($e->getMessage());
-                  return $sql;
-              }
-
-          }
-          else{
-              $this->addError('SELECT-Query without FROM and without JOIN!');
-              return $sql;
-          }
-      }
-      else
-          return $sql;
-  }
-
-  function getSQL() {
-    $r = '';
-    $nl = "\n";
-    $this->buildInitialIndexes();    
-    foreach ($this->indexes as $i => $index) {
-      $this->index = array_merge($this->getEmptyIndex(), $index);      
-      $this->analyzeIndex($this->getPattern('0'));
-      $sub_r = $this->getQuerySQL();
-      $r .= $r ? $nl . 'UNION' . $this->getDistinctSQL() . $nl : '';
-      $r .= $this->is_union_query ? '(' . $sub_r . ')' : $sub_r;
-      $this->indexes[$i] = $this->index;
-    }
-    $r .= $this->is_union_query ? $this->getLIMITSQL() : '';
-    if ($this->v('order_infos', 0, $this->infos['query'])) {
-      $r = preg_replace('/SELECT(\s+DISTINCT)?\s*/', 'SELECT\\1 NULL AS `_pos_`, ', $r);
-    }
-    if ($pd_count = $this->problematicDependencies()) {
-      /* re-arranging the patterns sometimes reduces the LEFT JOIN dependencies */
-      $set_sql = 0;
-      if (!$this->pattern_order_offset) $set_sql = 1;
-      if (!$set_sql && ($pd_count < $this->opt_sql_pd_count)) $set_sql = 1;
-      if (!$set_sql && ($pd_count == $this->opt_sql_pd_count) && (strlen($r) < strlen($this->opt_sql))) $set_sql = 1;
-      if ($set_sql) {
-        $this->opt_sql = $r;
-        $this->opt_sql_pd_count = $pd_count;
-      }
-      $this->pattern_order_offset++;
-      if ($this->pattern_order_offset > 5) {
-        return $this->opt_sql;
-      }
-      return $this->getSQL();
-    }
-    return $r;
-  }
-
-  function buildInitialIndexes() {
-    $this->dependency_log = array();
-    $this->index = $this->getEmptyIndex();
-    $this->buildIndex($this->infos['query']['pattern'], 0);
-    $tmp = $this->index;
-    $this->analyzeIndex($this->getPattern('0'));
-    $this->initial_index = $this->index;
-    $this->index = $tmp;
-    $this->is_union_query = $this->index['union_branches'] ? 1 : 0;
-    $this->indexes = $this->is_union_query ? $this->getUnionIndexes($this->index) : array($this->index);
-  }
-
-  function createTempTable($q_sql) {
-    $con = $this->store->getDBCon();
-    $v = $this->store->getDBVersion();
-    if ($this->cache_results) {
-      $tbl = $this->store->getTablePrefix() . 'Q' . md5($q_sql);
-    }
-    else {
-      $tbl = $this->store->getTablePrefix() . 'Q' . md5($q_sql . time() . uniqid(rand()));
-    }
-    if (strlen($tbl) > 64) $tbl = 'Q' . md5($tbl);
-    $tmp_sql = 'CREATE TEMPORARY TABLE ' . $tbl . ' ( ' . $this->getTempTableDef($tbl, $q_sql) . ') ';
-    $tmp_sql .= (($v < '04-01-00') && ($v >= '04-00-18')) ? 'ENGINE' : (($v >= '04-01-02') ? 'ENGINE' : 'TYPE');
-    $tmp_sql .= '=' . $this->engine_type;/* HEAP doesn't support AUTO_INCREMENT, and MySQL breaks on MEMORY sometimes */
-    if (!$this->queryDB($tmp_sql, $con) && !$this->queryDB(str_replace('CREATE TEMPORARY', 'CREATE', $tmp_sql), $con)) {
-      return $this->addError(mysql_error($con));
-    }
-    mysql_unbuffered_query('INSERT INTO ' . $tbl . ' ' . "\n" . $q_sql, $con);
-    if ($er = mysql_error($con)) $this->addError($er);
-    return $tbl;
-  }
-
-  function getEmptyIndex() {
-    return array(
-      'from' => array(),
-      'join' => array(),
-      'left_join' => array(),
-      'vars' => array(), 'graph_vars' => array(), 'graph_uris' => array(),
-      'bnodes' => array(),
-      'triple_patterns' => array(),
-      'sub_joins' => array(),
-      'constraints' => array(),
-      'union_branches'=> array(),
-      'patterns' => array(),
-      'havings' => array()
-    );
-  }
-
-  function getTempTableDef($tmp_tbl, $q_sql) {
-    $col_part = preg_replace('/^SELECT\s*(DISTINCT)?(.*)FROM.*$/s', '\\2', $q_sql);
-    $parts = explode(',', $col_part);
-    $has_order_infos = $this->v('order_infos', 0, $this->infos['query']);
-    $r = '';
-    $added = array();
-    foreach ($parts as $part) {
-      if (preg_match('/\.?(.+)\s+AS\s+`(.+)`/U', trim($part), $m) && !isset($added[$m[2]])) {
-        $col = $m[1];
-        $alias = $m[2];
-        if ($alias == '_pos_') continue;
-        $r .= $r ? ',' : '';
-        $r .= "\n `" . $alias . "` int UNSIGNED";
-        $added[$alias] = 1;
-      }
-    }
-    if ($has_order_infos) {
-      $r = "\n" . '`_pos_` mediumint NOT NULL AUTO_INCREMENT PRIMARY KEY, ' . $r;
-    }
-    return  $r ? $r . "\n" : ''; 
-  }
-    
-  function getFinalQueryResult($q_sql, $tmp_tbl) {
-    /* var names */
-    $vars = array();
-    $aggregate_vars = array();
-    foreach ($this->infos['query']['result_vars'] as $entry) {
-      if ($entry['aggregate']) {
-        $vars[] = $entry['alias'];
-        $aggregate_vars[] = $entry['alias'];
-      }
-      else {
-        $vars[] = $entry['var'];
-      }
-    }
-    /* result */
-    $r = array('variables' => $vars);
-    $v_sql = $this->getValueSQL($tmp_tbl, $q_sql);
-    //echo "\n\n" . $v_sql;
-    $t1 = ARC2::mtime();
-    $con = $this->store->getDBCon();
-    $rs = mysql_unbuffered_query($v_sql, $con);
-    if ($er = mysql_error($con)) {
-      $this->addError($er);
-    }
-    $t2 = ARC2::mtime();
-    $rows = array();
-    $types = array(0 => 'uri', 1 => 'bnode', 2 => 'literal');
-    if ($rs) {
-  		while ($pre_row = mysql_fetch_array($rs)) {
-        $row = array();
-        foreach ($vars as $var) {
-          if (isset($pre_row[$var])) {
-            $row[$var] = $pre_row[$var];
-            $row[$var . ' type'] = isset($pre_row[$var . ' type']) ? $types[$pre_row[$var . ' type']] : (in_array($var, $aggregate_vars) ? 'literal' : 'uri');
-            if (isset($pre_row[$var . ' lang_dt']) && ($lang_dt = $pre_row[$var . ' lang_dt'])) {
-              if (preg_match('/^([a-z]+(\-[a-z0-9]+)*)$/i', $lang_dt)) {
-                $row[$var . ' lang'] = $lang_dt;
-              }
-              else {
-                $row[$var . ' datatype'] = $lang_dt;
-              }
-            }
-          }
-        }
-        if ($row || !$vars) {
-          $rows[] = $row;
-        }
-      }
-    }
-    $r['rows'] = $rows;
-    return $r;
-  }
-  
-  /*  */
-  
-  function buildIndex($pattern, $id) {
-    $pattern['id'] = $id;
-    $type = $this->v('type', '', $pattern);
-    if (($type == 'filter') && $this->v('constraint', 0, $pattern)) {
-      $sub_pattern = $pattern['constraint'];
-      $sub_pattern['parent_id'] = $id;
-      $sub_id = $id . '_0';
-      $this->buildIndex($sub_pattern, $sub_id);
-      $pattern['constraint'] = $sub_id;
-    }
-    else {
-      $sub_patterns = $this->v('patterns', array(), $pattern);
-      $keys = array_keys($sub_patterns);
-      $spc = count($sub_patterns);
-      if (($spc > 4) && $this->pattern_order_offset) {
-        $keys = array();
-        for ($i = 0 ; $i < $spc; $i++) {
-          $keys[$i] = $i + $this->pattern_order_offset;
-          while ($keys[$i] >= $spc) $keys[$i] -= $spc;
-        }
-      }
-      foreach ($keys as $i => $key) {
-        $sub_pattern = $sub_patterns[$key];
-        $sub_pattern['parent_id'] = $id;
-        $sub_id = $id . '_' . $key;
-        $this->buildIndex($sub_pattern, $sub_id);
-        $pattern['patterns'][$i] = $sub_id;
-        if ($type == 'union') {
-          $this->index['union_branches'][] = $sub_id;
-        }
-      }
-    }
-    $this->index['patterns'][$id] = $pattern;
-  }
-  
-  /*  */
-
-  function analyzeIndex($pattern) {
-    $type = $pattern['type'];
-    $id = $pattern['id'];
-    /* triple */
-    if ($type == 'triple') {
-      foreach (array('s', 'p', 'o') as $term) {
-        if ($pattern[$term . '_type'] == 'var') {
-          $val = $pattern[$term];
-          $this->index['vars'][$val] = array_merge($this->v($val, array(), $this->index['vars']), array(array('table' => $pattern['id'], 'col' =>$term)));
-        }
-        if ($pattern[$term . '_type'] == 'bnode') {
-          $val = $pattern[$term];
-          $this->index['bnodes'][$val] = array_merge($this->v($val, array(), $this->index['bnodes']), array(array('table' => $pattern['id'], 'col' =>$term)));
-        }
-      }
-      $this->index['triple_patterns'][] = $pattern['id'];
-      /* joins */
-      $opt = $this->isOptionalPattern($id);
-      if ($opt) {
-        $this->index['left_join'][] = $id;
-      }
-      elseif (!$this->index['from']) {
-        $this->index['from'][] = $id;
-      }
-      elseif (!$this->getJoinInfos($id)) {
-        $this->index['from'][] = $id;
-      }
-      else {
-        $this->index['join'][] = $id;
-      }
-      /* graph infos, graph vars */
-      $this->index['patterns'][$id]['graph_infos'] = $this->getGraphInfos($id);
-      foreach ($this->index['patterns'][$id]['graph_infos'] as $info) {
-        if ($info['type'] == 'graph') {
-          if ($info['var']) {
-            $val = $info['var']['value'];
-            $this->index['graph_vars'][$val] = array_merge($this->v($val, array(), $this->index['graph_vars']), array(array('table' => $id)));
-          }
-          elseif ($info['uri']) {
-            $val = $info['uri'];
-            $this->index['graph_uris'][$val] = array_merge($this->v($val, array(), $this->index['graph_uris']), array(array('table' => $id)));
-          }
-        }
-      }
-    }
-    $sub_ids = $this->v('patterns', array(), $pattern);
-    foreach ($sub_ids as $sub_id) {
-      $this->analyzeIndex($this->getPattern($sub_id));
-    }
-  }
-  
-  /*  */
-
-  function getGraphInfos($id) {
-    $r = array();
-    if ($id) {
-      $pattern = $this->index['patterns'][$id];
-      $type = $pattern['type'];
-      /* graph */
-      if ($type == 'graph') {
-        $r[] = array('type' => 'graph', 'var' => $pattern['var'], 'uri' => $pattern['uri']);
-      }
-      $p_pattern = $this->index['patterns'][$pattern['parent_id']];
-      if (isset($p_pattern['graph_infos'])) {
-        return array_merge($p_pattern['graph_infos'], $r);
-      }
-      return array_merge($this->getGraphInfos($pattern['parent_id']), $r);
-    }
-    /* FROM / FROM NAMED */
-    else {
-      if (isset($this->infos['query']['dataset'])) {
-        foreach ($this->infos['query']['dataset'] as $set) {
-          $r[] = array_merge(array('type' => 'dataset'), $set);
-        }
-      }
-    }
-    return $r;
-  }
-  
-  /*  */
-
-  function getPattern($id) {
-    if (is_array($id)) {
-      return $id;
-    }
-    return $this->v($id, array(), $this->index['patterns']);
-  }
-
-  function getInitialPattern($id) {
-    return $this->v($id, array(), $this->initial_index['patterns']);
-  }
-
-  /*  */
-  
-  function getUnionIndexes($pre_index) {
-    $r = array();
-    $branches = array();
-    $min_depth = 1000;
-    /* only process branches with minimum depth */
-    foreach ($pre_index['union_branches'] as $id) {
-      $branches[$id] = count(preg_split('/\_/', $id));
-      $min_depth = min($min_depth, $branches[$id]);
-    }
-    foreach ($branches as $branch_id => $depth) {
-      if ($depth == $min_depth) {
-        $union_id = preg_replace('/\_[0-9]+$/', '', $branch_id);
-        $index = array('keeping' => $branch_id, 'union_branches' => array(), 'patterns' => $pre_index['patterns']);
-        $old_branches = $index['patterns'][$union_id]['patterns'];
-        $skip_id = ($old_branches[0] == $branch_id) ? $old_branches[1] : $old_branches[0];
-        $index['patterns'][$union_id]['type'] = 'group';
-        $index['patterns'][$union_id]['patterns'] = array($branch_id);
-        $has_sub_unions = 0;
-        foreach ($index['patterns'] as $pattern_id => $pattern) {
-          if (preg_match('/^' .$skip_id. '/', $pattern_id)) {
-             unset($index['patterns'][$pattern_id]);
-          }
-          elseif ($pattern['type'] == 'union') {
-            foreach ($pattern['patterns'] as $sub_union_branch_id) {
-              $index['union_branches'][] = $sub_union_branch_id;
-            }
-          }
-        }    
-        if ($index['union_branches']) {
-          $r = array_merge($r, $this->getUnionIndexes($index));
-        }
-        else {
-          $r[] = $index;
-        }
-      }
-    }
-    return $r;
-  }
-
-  /*  */
-
-  function isOptionalPattern($id) {
-    $pattern = $this->getPattern($id);
-    if ($this->v('type', '', $pattern) == 'optional') {
-      return 1;
-    }
-    if ($this->v('parent_id', '0', $pattern) == '0') {
-      return 0;
-    }    
-    
-    return $this->isOptionalPattern($pattern['parent_id']);
-  }
-
-  function getOptionalPattern($id) {
-    $pn = $this->getPattern($id);
-    do {
-      $pn = $this->getPattern($pn['parent_id']);
-    } while ($pn['parent_id'] && ($pn['type'] != 'optional'));
-    return $pn['id'];
-  }
-  
-  function sameOptional($id, $id2) {
-    return $this->getOptionalPattern($id) == $this->getOptionalPattern($id2);
-  }
-  
-  /*  */
-
-  function isUnionPattern($id) {
-    $pattern = $this->getPattern($id);
-    if ($this->v('type', '', $pattern) == 'union') {
-      return 1;
-    }
-    if ($this->v('parent_id', '0', $pattern) == '0') {
-      return 0;
-    }
-    return $this->isUnionPattern($pattern['parent_id']);
-  }
-  
-  /*  */
-
-  function getValueTable($col) {
-    return $this->store->getTablePrefix() . (preg_match('/^(s|o)$/', $col) ? $col . '2val' : 'id2val');
-  }
-  
-  function getGraphTable() {
-    return $this->store->getTablePrefix() . 'g2t';
-  }
-  
-  /*  */
-  
-  function getQuerySQL() {
-    $nl = "\n";
-    $where_sql = $this->getWHERESQL();  /* pre-fills $index['sub_joins'] $index['constraints'] */
-    $order_sql = $this->getORDERSQL();  /* pre-fills $index['sub_joins'] $index['constraints'] */
-    $return = '';
-    $return .=  ($this->is_union_query ? 'SELECT' : 'SELECT' . $this->getDistinctSQL()) . $nl;
-    $return .=  $this->getResultVarsSQL() . $nl;
-    $return .=  $this->getFROMSQL();
-    $return .=  $this->getAllJoinsSQL();    
-    $return .=  $this->getWHERESQL();
-    $return .=  $this->getGROUPSQL();
-    $return .=  $this->getORDERSQL();
-    $return .=  ($this->is_union_query ? '' : $this->getLIMITSQL()) . $nl . '';
-    return $return;
-  }
-
-  /*  */
-  
-  function getDistinctSQL() {
-    if ($this->is_union_query) {
-      return ($this->v('distinct', 0, $this->infos['query']) || $this->v('reduced', 0, $this->infos['query'])) ? '' : ' ALL';  
-    }
-    return ($this->v('distinct', 0, $this->infos['query']) || $this->v('reduced', 0, $this->infos['query'])) ? ' DISTINCT' : '';  
-  }
-
-  /*  */
-  
-  function getResultVarsSQL() {
-    $r = '';
-    $vars = $this->infos['query']['result_vars'];
-    $nl = "\n";
-    $added = array();
-    foreach ($vars as $var) {
-      $var_name = $var['var'];
-      $tbl_alias = '';
-      if ($tbl_infos = $this->getVarTableInfos($var_name, 0)) {
-        $tbl = $tbl_infos['table'];
-        $col = $tbl_infos['col'];
-        $tbl_alias = $tbl_infos['table_alias'];
-      }
-      elseif ($var_name == 1) {/* ASK query */
-        $r .= '1 AS `success`';
-      }
-      else {
-        $this->addError('Result variable "' .$var_name. '" not used in query.');
-      }
-      if ($tbl_alias) {
-        /* aggregate */
-        if ($var['aggregate']) {
-          $conv_code = '';
-          if (strtolower($var['aggregate']) != 'count') {
-            $tbl_alias = 'V_' . $tbl . '_' . $col . '.val';
-            $conv_code = '0 + ';
-          }
-          if (!isset($added[$var['alias']])) {
-            $r .= $r ? ',' . $nl . '  ' : '  ';
-            $distinct_code = (strtolower($var['aggregate']) == 'count') && $this->v('distinct', 0, $this->infos['query']) ? 'DISTINCT ' : '';
-            $r .= $var['aggregate'] . '(' . $conv_code . $distinct_code . $tbl_alias. ') AS `' . $var['alias'] . '`';
-            $added[$var['alias']] = 1;
-          }
-        }
-        /* normal var */
-        else {
-          if (!isset($added[$var_name])) {
-            $r .= $r ? ',' . $nl . '  ' : '  ';
-            $r .= $tbl_alias . ' AS `' . $var_name . '`';
-            $is_s = ($col == 's');
-            $is_p = ($col == 'p');
-            $is_o = ($col == 'o');
-            if ($tbl_alias == 'NULL') {
-              /* type / add in UNION queries? */
-              if ($is_s || $is_o) {
-                $r .= ', ' . $nl . '    NULL AS `' . $var_name . ' type`';
-              }
-              /* lang_dt / always add it in UNION queries, the var may be used as s/p/o */
-              if ($is_o || $this->is_union_query) {
-                $r .= ', ' . $nl . '    NULL AS `' . $var_name . ' lang_dt`';
-              }
-            }
-            else {
-              /* type */
-              if ($is_s || $is_o) {
-                $r .= ', ' . $nl . '    ' .$tbl_alias . '_type AS `' . $var_name . ' type`';
-              }
-              /* lang_dt / always add it in UNION queries, the var may be used as s/p/o */
-              if ($is_o) {
-                $r .= ', ' . $nl . '    ' .$tbl_alias . '_lang_dt AS `' . $var_name . ' lang_dt`';
-              }
-              elseif ($this->is_union_query) {
-                $r .= ', ' . $nl . '    NULL AS `' . $var_name . ' lang_dt`';
-              }
-            }
-            $added[$var_name] = 1;
-          }
-        }
-        if (!in_array($tbl_alias, $this->index['sub_joins'])) {
-          $this->index['sub_joins'][] = $tbl_alias;
-        }
-      }
-    }
-    return $r ? $r : '1 AS `success`';
-  }
-  
-  function getVarTableInfos($var, $ignore_initial_index = 1) {
-    if ($var == '*') {
-      return array('table' => '', 'col' => '', 'table_alias' => '*');
-    }
-    if ($infos = $this->v($var, 0, $this->index['vars'])) {
-      $infos[0]['table_alias'] = 'T_' . $infos[0]['table'] . '.' . $infos[0]['col'];
-      return $infos[0];
-    }
-    if ($infos = $this->v($var, 0, $this->index['graph_vars'])) {
-      $infos[0]['col'] = 'g';
-      $infos[0]['table_alias'] = 'G_' . $infos[0]['table'] . '.' . $infos[0]['col'];
-      return $infos[0];
-    }
-    if ($this->is_union_query && !$ignore_initial_index) {
-      if (($infos = $this->v($var, 0, $this->initial_index['vars'])) || ($infos = $this->v($var, 0, $this->initial_index['graph_vars']))) {
-        if (!in_array($var, $this->infos['null_vars'])) {
-          $this->infos['null_vars'][] = $var;
-        }
-        $infos[0]['table_alias'] = 'NULL';
-        $infos[0]['col'] = !isset($infos[0]['col']) ? '' : $infos[0]['col'];
-        return $infos[0];
-      }
-    }
-    return 0;
-  }
-  
-  /*  */
-  
-  function getFROMSQL() {
-    $r = '';
-    foreach ($this->index['from'] as $id) {
-      $r .= $r ? ', ' : 'FROM (';
-      $r .= $this->getTripleTable($id) . ' T_' . $id;
-    }
-    return $r ? $r . ')' : '';
-  }
-
-  /*  */
-  
-  function getOrderedJoinIDs() {
-    return array_merge($this->index['from'], $this->index['join'], $this->index['left_join']);
-  }
-
-  function getJoinInfos($id) {
-    $r = array();
-    $tbl_ids = $this->getOrderedJoinIDs();
-    $pattern = $this->getPattern($id);
-    foreach ($tbl_ids as $tbl_id) {
-      $tbl_pattern = $this->getPattern($tbl_id);
-      if ($tbl_id != $id) {
-        foreach (array('s', 'p', 'o') as $tbl_term) {
-          foreach (array('var', 'bnode', 'uri') as $term_type) {
-            if ($tbl_pattern[$tbl_term . '_type'] == $term_type) {
-              foreach (array('s', 'p', 'o') as $term) {
-                if (($pattern[$term . '_type'] == $term_type) && ($tbl_pattern[$tbl_term] == $pattern[$term])) {
-                  $r[] = array('term' => $term, 'join_tbl' => $tbl_id, 'join_term' => $tbl_term);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return $r;
-  }
-  
-  function getAllJoinsSQL() {
-    $js = $this->getJoins();
-    $ljs = $this->getLeftJoins();
-    $entries = array_merge($js, $ljs);
-    $id2code = array();
-    foreach ($entries as $entry) {
-      if (preg_match('/([^\s]+) ON (.*)/s', $entry, $m)) {
-        $id2code[$m[1]] = $entry;
-      }
-    }
-    $deps = array();
-    foreach ($id2code as $id => $code) {
-      $deps[$id]['rank'] = 0;
-      foreach ($id2code as $other_id => $other_code) {
-        $deps[$id]['rank'] += ($id != $other_id) && preg_match('/' . $other_id . '/', $code) ? 1 : 0;
-        $deps[$id][$other_id] = ($id != $other_id) && preg_match('/' . $other_id . '/', $code) ? 1 : 0;
-      }
-    }
-    $r = '';
-    do {
-      /* get next 0-rank */
-      $next_id = 0;
-      foreach ($deps as $id => $infos) {
-        if ($infos['rank'] == 0) {
-          $next_id = $id;
-          break;
-        }
-      }
-      if ($next_id) {
-        $r .= "\n" . $id2code[$next_id];
-        unset($deps[$next_id]);
-        foreach ($deps as $id => $infos) {
-          $deps[$id]['rank'] = 0;
-          unset($deps[$id][$next_id]);
-          foreach ($infos as $k => $v) {
-            if (!in_array($k, array('rank', $next_id))) {
-              $deps[$id]['rank'] += $v;
-              $deps[$id][$k] = $v;
-            }
-          }
-        }
-      }
-    }
-    while ($next_id);
-    if ($deps) {
-      $this->addError('Not all patterns could be rewritten to SQL JOINs');
-    }
-    return $r;
-  }
-  
-  function getJoins() {
-    $r = array();
-    $nl = "\n";
-    foreach ($this->index['join'] as $id) {
-      $sub_r = $this->getJoinConditionSQL($id);
-      $r[] = 'JOIN ' . $this->getTripleTable($id) . ' T_' . $id . ' ON (' . $sub_r . $nl . ')';
-    }
-    foreach (array_merge($this->index['from'], $this->index['join']) as $id) {
-      if ($sub_r = $this->getRequiredSubJoinSQL($id)) {
-        $r[] = $sub_r;
-      }
-    }
-    return $r;
-  }
-  
-  function getLeftJoins() {
-    $r = array();
-    $nl = "\n";
-    foreach ($this->index['left_join'] as $id) {
-      $sub_r = $this->getJoinConditionSQL($id);
-      $r[] = 'LEFT JOIN ' . $this->getTripleTable($id) . ' T_' . $id . ' ON (' . $sub_r . $nl . ')';
-    }
-    foreach ($this->index['left_join'] as $id) {
-      if ($sub_r = $this->getRequiredSubJoinSQL($id, 'LEFT')) {
-        $r[] = $sub_r;
-      }
-    }
-    return $r;
-  }
-  
-  function getJoinConditionSQL($id) {
-    $r = '';
-    $nl = "\n";
-    $infos = $this->getJoinInfos($id);
-    $pattern = $this->getPattern($id);
-    
-    $tbl = 'T_' . $id;
-    /* core dependency */
-    $d_tbls = $this->getDependentJoins($id);
-    foreach ($d_tbls as $d_tbl) {
-      if (preg_match('/^T_([0-9\_]+)\.[spo]+/', $d_tbl, $m) && ($m[1] != $id)) {
-        if ($this->isJoinedBefore($m[1], $id) && !in_array($m[1], array_merge($this->index['from'], $this->index['join']))) {
-          $r .= $r ? $nl . '  AND ' : $nl . '  ';
-          $r .= '(' . $d_tbl . ' IS NOT NULL)';
-        }
-        $this->logDependency($id, $d_tbl);
-      }
-    }
-    /* triple-based join info */
-    foreach ($infos as $info) {
-      if ($this->isJoinedBefore($info['join_tbl'], $id) && $this->joinDependsOn($id, $info['join_tbl'])) {
-        $r .= $r ? $nl . '  AND ' : $nl . '  ';
-        $r .= '(' . $tbl . '.' . $info['term'] . ' = T_' . $info['join_tbl'] . '.' . $info['join_term'] . ')';
-      }
-    }
-    /* filters etc */
-    if ($sub_r = $this->getPatternSQL($pattern, 'join__T_' . $id)) {
-      $r .= $r ? $nl . '  AND ' . $sub_r  : $nl . '  ' . '(' . $sub_r . ')';
-    }
-    return $r;
-  }
-
-  /**
-   * A log of identified table join dependencies in getJoinConditionSQL
-   *
-  */
-
-  function logDependency($id, $tbl) {
-    if (!isset($this->dependency_log[$id])) $this->dependency_log[$id] = array();
-    if (!in_array($tbl, $this->dependency_log[$id])) {
-      $this->dependency_log[$id][] = $tbl;
-    }
-  }
-
-  /**
-   * checks whether entries in the dependecy log could perhaps be optimized
-   * (triggers re-ordering of patterns
-  */
-
-  function problematicDependencies() {
-    foreach ($this->dependency_log as $id => $tbls) {
-      if (count($tbls) > 1) return count($tbls);
-    }
-    return 0;
-  }
-  
-  function isJoinedBefore($tbl_1, $tbl_2) {
-    $tbl_ids = $this->getOrderedJoinIDs();
-    foreach ($tbl_ids as $id) {
-      if ($id == $tbl_1) {
-        return 1;
-      }
-      if ($id == $tbl_2) {
-        return 0;
-      }
-    }
-  }
-  
-  function joinDependsOn($id, $id2) {
-    if (in_array($id2, array_merge($this->index['from'], $this->index['join']))) {
-      return 1;
-    }
-    $d_tbls = $this->getDependentJoins($id2);
-    //echo $id . ' :: ' . $id2 . '=>' . print_r($d_tbls, 1);
-    foreach ($d_tbls as $d_tbl) {
-      if (preg_match('/^T_' .$id. '\./', $d_tbl)) {
-        return 1;
-      }
-    }
-    return 0;
-  }
-  
-  function getDependentJoins($id) {
-    $r = array();
-    /* sub joins */
-    foreach ($this->index['sub_joins'] as $alias) {
-      if (preg_match('/^(T|V|G)_' . $id . '/', $alias)) {
-        $r[] = $alias;
-      }
-    }
-    /* siblings in shared optional */
-    $o_id = $this->getOptionalPattern($id);
-    foreach ($this->index['sub_joins'] as $alias) {
-      if (preg_match('/^(T|V|G)_' . $o_id . '/', $alias) && !in_array($alias, $r)) {
-        $r[] = $alias;
-      }
-    }
-    foreach ($this->index['left_join'] as $alias) {
-      if (preg_match('/^' . $o_id . '/', $alias) && !in_array($alias, $r)) {
-        $r[] = 'T_' . $alias . '.s';
-      }
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function getRequiredSubJoinSQL($id, $prefix = '') {/* id is a triple pattern id. Optional FILTERS and GRAPHs are getting added to the join directly */
-    $nl = "\n";
-    $r = '';
-    foreach ($this->index['sub_joins'] as $alias) {
-      if (preg_match('/^V_' . $id . '_([a-z\_]+)\.val$/', $alias, $m)) {
-        $col = $m[1];
-        $sub_r = '';
-        if ($this->isOptionalPattern($id)) {
-          $pattern = $this->getPattern($id);
-          do {
-            $pattern = $this->getPattern($pattern['parent_id']);
-          } while ($pattern['parent_id'] && ($pattern['type'] != 'optional'));
-          $sub_r = $this->getPatternSQL($pattern, 'sub_join__V_' . $id);
-        }
-        $sub_r = $sub_r ? $nl . '  AND (' . $sub_r . ')' : '';
-        /* lang dt only on literals */
-        if ($col == 'o_lang_dt') {
-          $sub_sub_r = 'T_' . $id . '.o_type = 2'; 
-          $sub_r .= $nl . '  AND (' . $sub_sub_r . ')';
-        }
-        //$cur_prefix = $prefix ? $prefix . ' ' : 'STRAIGHT_';
-        $cur_prefix = $prefix ? $prefix . ' ' : '';
-        if ($col == 'g') {
-          $r .= trim($cur_prefix . 'JOIN '. $this->getValueTable($col) . ' V_' .$id . '_' . $col. ' ON (' .$nl. '  (G_' . $id . '.' . $col. ' = V_' . $id. '_' . $col. '.id) ' . $sub_r . $nl . ')');
-        }
-        else {
-          $r .= trim($cur_prefix . 'JOIN '. $this->getValueTable($col) . ' V_' .$id . '_' . $col. ' ON (' .$nl. '  (T_' . $id . '.' . $col. ' = V_' . $id. '_' . $col. '.id) ' . $sub_r . $nl . ')');
-        }
-      }
-      elseif (preg_match('/^G_' . $id . '\.g$/', $alias, $m)) {
-        $pattern = $this->getPattern($id);
-        $sub_r = $this->getPatternSQL($pattern, 'graph_sub_join__G_' . $id);
-        $sub_r = $sub_r ? $nl . '  AND ' . $sub_r : '';
-        /* dataset restrictions */
-        $gi = $this->getGraphInfos($id);
-        $sub_sub_r = '';
-        $added_gts = array();
-        foreach ($gi as $set) {
-          if (isset($set['graph']) && !in_array($set['graph'], $added_gts)) {
-            $sub_sub_r .= $sub_sub_r !== '' ? ',' : '';
-            $sub_sub_r .= $this->getTermID($set['graph'], 'g'); 
-            $added_gts[] = $set['graph'];
-          }
-        }
-        $sub_r .= ($sub_sub_r !== '') ? $nl . ' AND (G_' . $id . '.g IN (' . $sub_sub_r . '))' : ''; // /* ' . str_replace('#' , '::', $set['graph']) . ' */';
-        /* other graph join conditions */
-        foreach ($this->index['graph_vars'] as $var => $occurs) {
-          $occur_tbls = array();
-          foreach ($occurs as $occur) {
-            $occur_tbls[] = $occur['table'];
-            if ($occur['table'] == $id) break;
-          }
-          foreach($occur_tbls as $tbl) {
-            if (($tbl != $id) && in_array($id, $occur_tbls) && $this->isJoinedBefore($tbl, $id)) {
-              $sub_r .= $nl . '  AND (G_' .$id. '.g = G_' .$tbl. '.g)'; 
-            }
-          }
-        }
-        //$cur_prefix = $prefix ? $prefix . ' ' : 'STRAIGHT_';
-        $cur_prefix = $prefix ? $prefix . ' ' : '';
-        $r .= trim($cur_prefix . 'JOIN '. $this->getGraphTable() . ' G_' .$id . ' ON (' .$nl. '  (T_' . $id . '.t = G_' .$id. '.t)' . $sub_r . $nl . ')');
-      }
-    }
-    return $r;
-  }
-
-  /*  */
-
-  function getWHERESQL() {
-    $r = '';
-    $nl = "\n";
-    /* standard constraints */
-    $sub_r = $this->getPatternSQL($this->getPattern('0'), 'where');
-    /* additional constraints */
-    foreach ($this->index['from'] as $id) {
-      if ($sub_sub_r = $this->getConstraintSQL($id)) {
-        $sub_r .= $sub_r ? $nl . ' AND ' . $sub_sub_r : $sub_sub_r;
-      }
-    }
-    $r .= $sub_r ? $sub_r : '';
-    /* left join dependencies */
-    foreach ($this->index['left_join'] as $id) {
-      $d_joins = $this->getDependentJoins($id);
-      $added = array();
-      $d_aliases = array();
-      //echo $id . ' =>' . print_r($d_joins, 1);
-      $id_alias = 'T_' . $id . '.s';
-      foreach ($d_joins as $alias) {
-        if (preg_match('/^(T|V|G)_([0-9\_]+)(_[spo])?\.([a-z\_]+)/', $alias, $m)) {
-          $tbl_type = $m[1];
-          $tbl_pattern_id = $m[2];
-          $suffix = $m[3];
-          if (($tbl_pattern_id >= $id) && $this->sameOptional($tbl_pattern_id, $id)) {/* get rid of dependency permutations and nested optionals */
-            if (!in_array($tbl_type . '_' . $tbl_pattern_id . $suffix, $added)) {
-              $sub_r .= $sub_r ? ' AND ' : '';
-              $sub_r .= $alias . ' IS NULL';
-              $d_aliases[] = $alias;
-              $added[] = $tbl_type . '_' . $tbl_pattern_id . $suffix;
-              $id_alias = ($tbl_pattern_id == $id) ? $alias : $id_alias;
-            }
-          }
-        }
-      }
-      if (count($d_aliases) > 2) {/* @@todo fix this! */
-        $sub_r1 = '  /* '.$id_alias.' dependencies */';
-        $sub_r2 = '((' . $id_alias . ' IS NULL) OR (CONCAT(' . join(', ', $d_aliases) . ') IS NOT NULL))';
-        $r .= $r ? $nl . $sub_r1 . $nl . '  AND ' .$sub_r2 : $sub_r1 . $nl . $sub_r2;
-      }
-    }
-    return $r ? $nl . 'WHERE ' . $r : '';
-  }
-
-  /*  */
-  
-  function addConstraintSQLEntry($id, $sql) {
-    if (!isset($this->index['constraints'][$id])) {
-      $this->index['constraints'][$id] = array();
-    }
-    if (!in_array($sql, $this->index['constraints'][$id])) {
-      $this->index['constraints'][$id][] = $sql;
-    }
-  }
-  
-  function getConstraintSQL($id) {
-    $r = '';
-    $nl = "\n";
-    $constraints = $this->v($id, array(), $this->index['constraints']);
-    foreach ($constraints as $constraint) {
-      $r .= $r ? $nl . '  AND ' . $constraint : $constraint;
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function getPatternSQL($pattern, $context) {
-    $type = $pattern['type'];
-    $m = 'get' . ucfirst($type) . 'PatternSQL';
-    return method_exists($this, $m) ? $this->$m($pattern, $context) : $this->getDefaultPatternSQL($pattern, $context);
-  }
-
-  function getDefaultPatternSQL($pattern, $context) {
-    $r = '';
-    $nl = "\n";
-    $sub_ids = $this->v('patterns', array(), $pattern);
-    foreach ($sub_ids as $sub_id) {
-      $sub_r = $this->getPatternSQL($this->getPattern($sub_id), $context);
-      $r .= ($r && $sub_r) ? $nl . '  AND (' . $sub_r . ')' : ($sub_r ? $sub_r  : '');
-    }
-    return $r ? $r : '';
-  }
-  
-  function getTriplePatternSQL($pattern, $context) {
-    $r = '';
-    $nl = "\n";
-    $id = $pattern['id'];
-    /* s p o */
-    $vars = array();
-    foreach (array('s', 'p', 'o') as $term) {
-      $sub_r = '';
-      $type = $pattern[$term . '_type'];
-      if ($type == 'uri') {
-        $term_id = $this->getTermID($pattern[$term], $term);
-        $sub_r = '(T_' . $id . '.' . $term . ' = ' . $term_id . ') /* ' . str_replace('#' , '::', $pattern[$term]) . ' */';
-      }
-      elseif ($type == 'literal') {
-        $term_id = $this->getTermID($pattern[$term], $term);
-        $sub_r = '(T_' . $id . '.' . $term . ' = ' . $term_id . ') /* ' . preg_replace('/[\#\n]/' , ' ', $pattern[$term]) . ' */';
-        if (($lang_dt = $this->v1($term . '_lang', '', $pattern)) || ($lang_dt = $this->v1($term . '_datatype', '', $pattern))) {
-          $lang_dt_id = $this->getTermID($lang_dt);
-          $sub_r .= $nl . '  AND (T_' . $id . '.' .$term. '_lang_dt = ' . $lang_dt_id . ') /* ' . str_replace('#' , '::', $lang_dt) . ' */';
-        }
-      }
-      elseif ($type == 'var') {
-        $val = $pattern[$term];
-        if (isset($vars[$val])) {/* repeated var in pattern */
-          $sub_r = '(T_' . $id . '.' . $term . '=' . 'T_' . $id . '.' . $vars[$val] . ')';
-        }
-        $vars[$val] = $term;
-        if ($infos = $this->v($val, 0, $this->index['graph_vars'])) {/* graph var in triple pattern */
-          $sub_r .= $sub_r ? $nl . '  AND ' : '';
-          $tbl = $infos[0]['table'];
-          $sub_r .= 'G_' . $tbl . '.g = T_' . $id . '.' . $term;
-        }
-      }
-      if ($sub_r) {
-        if (preg_match('/^(join)/', $context) || (preg_match('/^where/', $context) && in_array($id, $this->index['from']))) {
-          $r .= $r ? $nl . '  AND ' . $sub_r  : $sub_r;
-        }
-      }
-    }
-    /* g */
-    if ($infos = $pattern['graph_infos']) {
-      $tbl_alias = 'G_' . $id . '.g';
-      if (!in_array($tbl_alias, $this->index['sub_joins'])) {
-        $this->index['sub_joins'][] = $tbl_alias;
-      }
-      $sub_r = array('graph_var' => '', 'graph_uri' => '', 'from' => '', 'from_named' => '');
-      foreach ($infos as $info) {
-        $type = $info['type'];
-        if ($type == 'graph') {
-          if ($info['uri']) {
-            $term_id = $this->getTermID($info['uri'], 'g');
-            $sub_r['graph_uri'] .= $sub_r['graph_uri'] ? $nl . ' AND ' : '';
-            $sub_r['graph_uri'] .= '(' .$tbl_alias. ' = ' . $term_id . ') /* ' . str_replace('#' , '::', $info['uri']) . ' */';
-          }
-        }
-      }
-      if ($sub_r['from'] && $sub_r['from_named']) {
-        $sub_r['from_named'] = '';
-      }
-      if (!$sub_r['from'] && !$sub_r['from_named']) {
-        $sub_r['graph_var'] = '';
-      }
-      if (preg_match('/^(graph_sub_join)/', $context)) {
-        foreach ($sub_r as $g_type => $g_sql) {
-          if ($g_sql) {
-            $r .= $r ? $nl . '  AND ' . $g_sql  : $g_sql;
-          }
-        }
-      }
-    }
-    /* optional sibling filters? */
-    if (preg_match('/^(join|sub_join)/', $context) && $this->isOptionalPattern($id)) {
-      $o_pattern = $pattern;
-      do {
-        $o_pattern = $this->getPattern($o_pattern['parent_id']);
-      } while ($o_pattern['parent_id'] && ($o_pattern['type'] != 'optional'));
-      if ($sub_r = $this->getPatternSQL($o_pattern, 'optional_filter' . preg_replace('/^(.*)(__.*)$/', '\\2', $context))) {
-        $r .= $r ? $nl . '  AND ' . $sub_r  : $sub_r;
-      }
-      /* created constraints */
-      if ($sub_r = $this->getConstraintSQL($id)) {
-        $r .= $r ? $nl . '  AND ' . $sub_r  : $sub_r;
-      }
-    }
-    /* result */
-    if (preg_match('/^(where)/', $context) && $this->isOptionalPattern($id)) {
-      return '';
-    }
-    return $r;
-  }
-  
-  /*  */
-  
-  function getFilterPatternSQL($pattern, $context) {
-    $r = '';
-    $id = $pattern['id'];
-    $constraint_id = $this->v1('constraint', '', $pattern);
-    $constraint = $this->getPattern($constraint_id);
-    $constraint_type = $constraint['type'];
-    if ($constraint_type == 'built_in_call') {
-      $r = $this->getBuiltInCallSQL($constraint, $context);
-    }
-    elseif ($constraint_type == 'expression') {
-      $r = $this->getExpressionSQL($constraint, $context, '', 'filter');
-    }
-    else {
-      $m = 'get' . ucfirst($constraint_type) . 'ExpressionSQL';
-      if (method_exists($this, $m)) {
-        $r = $this->$m($constraint, $context, '', 'filter');
-      }
-    }
-    if ($this->isOptionalPattern($id) && !preg_match('/^(join|optional_filter)/', $context)) {
-      return '';
-    }
-    /* unconnected vars in FILTERs eval to false */
-    $sub_r = $this->hasUnconnectedFilterVars($id);
-    if ($sub_r) {
-      if ($sub_r == 'alias') {
-        if (!in_array($r, $this->index['havings'])) $this->index['havings'][] = $r;
-        return '';
-      }
-      elseif (preg_match('/^T([^\s]+\.)g (.*)$/s', $r, $m)) {/* graph filter */
-        return 'G' . $m[1] . 't ' . $m[2];
-      }
-      elseif (preg_match('/^\(*V[^\s]+_g\.val .*$/s', $r, $m)) {/* graph value filter, @@improveMe */
-        //return $r;
-      }
-      else {
-        return 'FALSE';
-      }
-    }
-    /* some really ugly tweaks */
-    /* empty language filter: FILTER ( lang(?v) = '' ) */
-    $r = preg_replace('/\(\/\* language call \*\/ ([^\s]+) = ""\)/s', '((\\1 = "") OR (\\1 LIKE "%:%"))', $r);
-    return $r;
-  }
-  
-  /**
-   * Checks if vars in the given (filter) pattern are used within the filter's scope.
-   */
-  
-  function hasUnconnectedFilterVars($filter_pattern_id) {
-    $scope_id = $this->getFilterScope($filter_pattern_id);
-    $vars = $this->getFilterVars($filter_pattern_id);
-    $r = 0;
-    foreach ($vars as $var_name) {
-      if ($this->isUsedTripleVar($var_name, $scope_id)) continue;
-      if ($this->isAliasVar($var_name)) {
-        $r = 'alias';
-        break;
-      }
-      $r = 1;
-      break;
-    }
-    return $r;
-  }
-  
-  /**
-   * Returns the given filter pattern's scope (the id of the parent group pattern).
-   */
-
-  function getFilterScope($filter_pattern_id) {
-    $patterns = $this->initial_index['patterns'];
-    $r = '';
-    foreach ($patterns as $id => $p) {
-      /* the id has to be sub-part of the given filter id */
-      if (!preg_match('/^' . $id . '.+/', $filter_pattern_id)) continue;
-      /* we are looking for a group or union */
-      if (!preg_match('/^(group|union)$/', $p['type'])) continue;
-      /* we are looking for the longest/deepest match */
-      if (strlen($id) > strlen($r)) $r = $id;
-    }
-    return $r;
-  }
-
-  /**
-   * Builds a list of vars used in the given (filter) pattern.
-   */
-
-  function getFilterVars($filter_pattern_id) {
-    $r = array();
-    $patterns = $this->initial_index['patterns'];
-    /* find vars in the given filter (i.e. the given id is part of their pattern id) */
-    foreach ($patterns as $id => $p) {
-      if (!preg_match('/^' . $filter_pattern_id . '.+/', $id)) continue;
-      $var_name = '';
-      if ($p['type'] == 'var') {
-        $var_name = $p['value'];
-      }
-      elseif (($p['type'] == 'built_in_call') && ($p['call'] == 'bound')) {
-        $var_name = $p['args'][0]['value'];
-      }
-      if ($var_name && !in_array($var_name, $r)) {
-        $r[] = $var_name;
-      }
-    }
-    return $r;
-  }
-
-  /**
-   * Checks if $var_name appears as result projection alias.
-   */
-
-  function isAliasVar($var_name) {
-    foreach ($this->infos['query']['result_vars'] as $r_var) {
-      if ($r_var['alias'] == $var_name) return 1;
-    }
-    return 0;
-  }
-
-  /**
-   * Checks if $var_name is used in a triple pattern in the given scope
-   */
-
-  function isUsedTripleVar($var_name, $scope_id = '0') {
-    $patterns = $this->initial_index['patterns'];
-    foreach ($patterns as $id => $p) {
-      if ($p['type'] != 'triple') continue;
-      if (!preg_match('/^' . $scope_id . '.+/', $id)) continue;
-      foreach (array('s', 'p', 'o') as $term) {
-        if ($p[$term . '_type'] != 'var') continue;
-        if ($p[$term] == $var_name) return 1;
-      }
-    }
-  }
-
-  /*  */
-
-  function getExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $r = '';
-    $nl = "\n";
-    $type = $this->v1('type', '', $pattern);
-    $sub_type = $this->v1('sub_type', $type, $pattern);
-    if (preg_match('/^(and|or)$/', $sub_type)) {
-      foreach ($pattern['patterns'] as $sub_id) {
-        $sub_pattern = $this->getPattern($sub_id);
-        $sub_pattern_type = $sub_pattern['type'];
-        if ($sub_pattern_type == 'built_in_call') {
-          $sub_r = $this->getBuiltInCallSQL($sub_pattern, $context, '', $parent_type);
-        }
-        else {
-          $sub_r = $this->getExpressionSQL($sub_pattern, $context, '', $parent_type);
-        }
-        if ($sub_r) {
-          $r .= $r ? ' ' . strtoupper($sub_type). ' (' .$sub_r. ')' : '(' . $sub_r . ')';
-        }
-      }
-    }
-    elseif ($sub_type == 'built_in_call') {
-      $r = $this->getBuiltInCallSQL($pattern, $context, $val_type, $parent_type);
-    }
-    elseif (preg_match('/literal/', $sub_type)) {
-      $r = $this->getLiteralExpressionSQL($pattern, $context, $val_type, $parent_type);
-    }
-    elseif ($sub_type) {
-      $m = 'get' . ucfirst($sub_type) . 'ExpressionSQL';
-      if (method_exists($this, $m)) {
-        $r = $this->$m($pattern, $context, '', $parent_type);
-      }
-    }
-    /* skip expressions that reference non-yet-joined tables */
-    if (preg_match('/__(T|V|G)_(.+)$/', $context, $m)) {
-      $context_pattern_id = $m[2];
-      $context_table_type = $m[1];
-      if (preg_match_all('/((T|V|G)(\_[0-9])+)/', $r, $m)) {
-        $aliases = $m[1];
-        $keep = 1;
-        foreach ($aliases as $alias) {
-          if (preg_match('/(T|V|G)_(.*)$/', $alias, $m)) {
-            $tbl_type = $m[1];
-            $tbl = $m[2];
-            if (!$this->isJoinedBefore($tbl, $context_pattern_id)) {
-              $keep = 0;
-            }
-            elseif (($context_pattern_id == $tbl) && preg_match('/(TV)/', $context_table_type . $tbl_type)) {
-              $keep = 0;
-            }
-          }
-        }
-        $r = $keep ? $r : '';
-      }
-    }
-    return $r ? '(' . $r . ')' : $r;
-  }
-  
-  function detectExpressionValueType($pattern_ids) {
-    foreach ($pattern_ids as $id) {
-      $pattern = $this->getPattern($id);
-      $type = $this->v('type', '', $pattern);
-      if (($type == 'literal') && isset($pattern['datatype'])) {
-        if (in_array($pattern['datatype'], array($this->xsd . 'integer', $this->xsd . 'float', $this->xsd . 'double'))) {
-          return 'numeric';
-        }
-      }
-    }
-    return '';
-  }
-
-  /*  */
-
-  function getRelationalExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $r = '';
-    $val_type = $this->detectExpressionValueType($pattern['patterns']);
-    $op = $pattern['operator'];
-    foreach ($pattern['patterns'] as $sub_id) {
-      $sub_pattern = $this->getPattern($sub_id);
-      $sub_pattern['parent_op'] = $op;
-      $sub_type = $sub_pattern['type'];
-      $m = ($sub_type == 'built_in_call') ? 'getBuiltInCallSQL' : 'get' . ucfirst($sub_type) . 'ExpressionSQL';
-      $m = str_replace('ExpressionExpression', 'Expression', $m);
-      $sub_r = method_exists($this, $m) ? $this->$m($sub_pattern, $context, $val_type, 'relational') : '';
-      $r .= $r ? ' ' . $op . ' ' . $sub_r : $sub_r;
-    }
-    return $r ? '(' . $r . ')' : $r;
-  }
-
-  function getAdditiveExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $r = '';
-    $val_type = $this->detectExpressionValueType($pattern['patterns']);
-    foreach ($pattern['patterns'] as $sub_id) {
-      $sub_pattern = $this->getPattern($sub_id);
-      $sub_type = $this->v('type', '', $sub_pattern);
-      $m = ($sub_type == 'built_in_call') ? 'getBuiltInCallSQL' : 'get' . ucfirst($sub_type) . 'ExpressionSQL';
-      $m = str_replace('ExpressionExpression', 'Expression', $m);
-      $sub_r = method_exists($this, $m) ? $this->$m($sub_pattern, $context, $val_type, 'additive') : '';
-      $r .= $r ? ' ' . $sub_r : $sub_r;
-    }
-    return $r;
-  }
-
-  function getMultiplicativeExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $r = '';
-    $val_type = $this->detectExpressionValueType($pattern['patterns']);
-    foreach ($pattern['patterns'] as $sub_id) {
-      $sub_pattern = $this->getPattern($sub_id);
-      $sub_type = $sub_pattern['type'];
-      $m = ($sub_type == 'built_in_call') ? 'getBuiltInCallSQL' : 'get' . ucfirst($sub_type) . 'ExpressionSQL';
-      $m = str_replace('ExpressionExpression', 'Expression', $m);
-      $sub_r = method_exists($this, $m) ? $this->$m($sub_pattern, $context, $val_type, 'multiplicative') : '';
-      $r .= $r ? ' ' . $sub_r : $sub_r;
-    }
-    return $r;
-  }
-
-  /*  */
-
-  function getVarExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $var = $pattern['value'];
-    $info = $this->getVarTableInfos($var);
-    if (!$tbl = $info['table']) {
-      /* might be an aggregate var */
-      $vars = $this->infos['query']['result_vars'];
-      foreach ($vars as $test_var) {
-        if ($test_var['alias'] == $pattern['value']) {
-          return '`' . $pattern['value'] . '`';
-        }
-      }
-      return '';
-    }
-    $col = $info['col'];
-    if (($context == 'order') && ($col == 'o')) {
-      $tbl_alias = 'T_' . $tbl . '.o_comp';
-    }
-    elseif ($context == 'sameterm') {
-      $tbl_alias = 'T_' . $tbl . '.' . $col;
-    }
-    elseif (($parent_type == 'relational') && ($col == 'o') && (preg_match('/[\<\>]/', $this->v('parent_op', '', $pattern)))) {
-      $tbl_alias = 'T_' . $tbl . '.o_comp';
-    }
-    else {
-      $tbl_alias = 'V_' . $tbl . '_' . $col . '.val';
-      if (!in_array($tbl_alias, $this->index['sub_joins'])) {
-        $this->index['sub_joins'][] = $tbl_alias;
-      }
-    }
-    $op = $this->v('operator', '', $pattern);
-    if (preg_match('/^(filter|and)/', $parent_type)) {
-      if ($op == '!') {
-        $r = '(((' . $tbl_alias . ' = 0) AND (CONCAT("1", ' . $tbl_alias . ') != 1))'; /* 0 and no string */
-        $r .= ' OR (' . $tbl_alias . ' IN ("", "false")))'; /* or "", or "false" */
-      }
-      else {
-        $r = '((' . $tbl_alias . ' != 0)'; /* not null */
-        $r .= ' OR ((CONCAT("1", ' . $tbl_alias . ') = 1) AND (' . $tbl_alias . ' NOT IN ("", "false"))))'; /* string, and not "" or "false" */
-      }
-    }
-    else {
-      $r = trim($op . ' ' . $tbl_alias);
-      if ($val_type == 'numeric') {
-        if (preg_match('/__(T|V|G)_(.+)$/', $context, $m)) {
-          $context_pattern_id = $m[2];
-          $context_table_type = $m[1];
-        }
-        else {
-          $context_pattern_id = $pattern['id'];
-          $context_table_type = 'T';
-        }
-        if ($this->isJoinedBefore($tbl, $context_pattern_id)) {
-          $add = ($tbl != $context_pattern_id) ? 1 : 0;
-          $add = (!$add && ($context_table_type == 'V')) ? 1 : 0;
-          if ($add) {
-            $this->addConstraintSQLEntry($context_pattern_id, '(' .$r. ' = "0" OR ' . $r . '*1.0 != 0)');
-          }
-        }
-      }
-    }
-    return $r;
-  }
-  
-  /*  */
-
-  function getUriExpressionSQL($pattern, $context, $val_type = '') {
-    $val = $pattern['uri'];
-    $r = $pattern['operator'];
-    $r .= is_numeric($val) ? ' ' . $val : ' "' . mysql_real_escape_string($val, $this->store->getDBCon()) . '"';
-    return $r;
-  }
-  
-  /*  */
-
-  function getLiteralExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $val = $pattern['value'];
-    $r = $pattern['operator'];
-    if (is_numeric($val) && $this->v('datatype', 0, $pattern)) {
-      $r .= ' ' . $val;
-    }
-    elseif (preg_match('/^(true|false)$/i', $val) && ($this->v1('datatype', '', $pattern) == 'http://www.w3.org/2001/XMLSchema#boolean')) {
-      $r .= ' ' . strtoupper($val);
-    }
-    elseif ($parent_type == 'regex') {
-      $sub_r = mysql_real_escape_string($val, $this->store->getDBCon());
-      $r .= ' "' . preg_replace('/\x5c\x5c/', '\\', $sub_r) . '"';
-    }
-    else {
-      $r .= ' "' . mysql_real_escape_string($val, $this->store->getDBCon()) . '"';
-    }
-    if (($lang_dt = $this->v1('lang', '', $pattern)) || ($lang_dt = $this->v1('datatype', '', $pattern))) {
-      /* try table/alias via var in siblings */
-      if ($var = $this->findSiblingVarExpression($pattern['id'])) {
-        if (isset($this->index['vars'][$var])) {
-          $infos = $this->index['vars'][$var];
-          foreach ($infos as $info) {
-            if ($info['col'] == 'o') {
-              $tbl = $info['table'];
-              $term_id = $this->getTermID($lang_dt);
-              if ($pattern['operator'] != '!=') {
-                if (preg_match('/__(T|V|G)_(.+)$/', $context, $m)) {
-                  $context_pattern_id = $m[2];
-                  $context_table_type = $m[1];
-                }
-                elseif ($context == 'where') {
-                  $context_pattern_id = $tbl;
-                }
-                else {
-                  $context_pattern_id = $pattern['id'];
-                }
-                if ($tbl == $context_pattern_id) {/* @todo better dependency check */
-                  if ($term_id || ($lang_dt != 'http://www.w3.org/2001/XMLSchema#integer')) {/* skip if simple int, but no id */
-                    $this->addConstraintSQLEntry($context_pattern_id, 'T_' . $tbl . '.o_lang_dt = ' . $term_id . ' /* ' . str_replace('#' , '::', $lang_dt) . ' */');
-                  }
-                }
-              }
-              break;
-            }
-          }
-        }
-      }
-    }
-    return trim($r);
-  }
-  
-  function findSiblingVarExpression($id) {
-    $pattern = $this->getPattern($id);
-    do {
-      $pattern = $this->getPattern($pattern['parent_id']);
-    } while ($pattern['parent_id'] && ($pattern['type'] != 'expression'));
-    $sub_patterns = $this->v('patterns', array(), $pattern);
-    foreach ($sub_patterns as $sub_id) {
-      $sub_pattern = $this->getPattern($sub_id);
-      if ($sub_pattern['type'] == 'var') {
-        return $sub_pattern['value'];
-      }
-    }
-    return '';
-  }
-  
-  /*  */
-
-  function getFunctionExpressionSQL($pattern, $context, $val_type = '', $parent_type = '') {
-    $fnc_uri = $pattern['uri'];
-    $op = $this->v('operator', '', $pattern);
-    if ($op) $op .= ' ';
-    if ($this->allow_extension_functions) {
-      /* mysql functions */
-      if (preg_match('/^http\:\/\/web\-semantics\.org\/ns\/mysql\/(.*)$/', $fnc_uri, $m)) {
-        $fnc_name = strtoupper($m[1]);
-        $sub_r = '';
-        foreach ($pattern['args'] as $arg) {
-          $sub_r .= $sub_r ? ', ' : '';
-          $sub_r .= $this->getExpressionSQL($arg, $context, $val_type, $parent_type);
-        }
-        return $op . $fnc_name . '(' . $sub_r . ')';
-      }
-      /* any other: ignore */
-    }
-    /* simple type conversions */
-    if (strpos($fnc_uri, 'http://www.w3.org/2001/XMLSchema#') === 0) {
-      return $op . $this->getExpressionSQL($pattern['args'][0], $context, $val_type, $parent_type);
-    }
-    return '';
-  }
-
-  /*  */
-
-  function getBuiltInCallSQL($pattern, $context) {
-    $call = $pattern['call'];
-    $m = 'get' . ucfirst($call) . 'CallSQL';
-    if (method_exists($this, $m)) {
-      return $this->$m($pattern, $context);
-    }
-    else {
-      $this->addError('Unknown built-in call "' . $call . '"');
-    }
-    return '';
-  }
-  
-  function getBoundCallSQL($pattern, $context) {
-    $r = '';
-    $var = $pattern['args'][0]['value'];
-    $info = $this->getVarTableInfos($var);
-    if (!$tbl = $info['table']) {
-      return '';
-    }
-    $col = $info['col'];
-    $tbl_alias = 'T_' . $tbl . '.' . $col;
-    if ($pattern['operator'] == '!') {
-      return $tbl_alias . ' IS NULL';
-    }
-    return $tbl_alias . ' IS NOT NULL';
-  }
-
-  function getHasTypeCallSQL($pattern, $context, $type) {
-    $r = '';
-    $var = $pattern['args'][0]['value'];
-    $info = $this->getVarTableInfos($var);
-    if (!$tbl = $info['table']) {
-      return '';
-    }
-    $col = $info['col'];
-    $tbl_alias = 'T_' . $tbl . '.' . $col . '_type';
-    return $tbl_alias . ' ' .$this->v('operator', '', $pattern) . '= ' . $type;
-  }
-
-  function getIsliteralCallSQL($pattern, $context) {
-    return $this->getHasTypeCallSQL($pattern, $context, 2);
-  }
-
-  function getIsblankCallSQL($pattern, $context) {
-    return $this->getHasTypeCallSQL($pattern, $context, 1);
-  }
-
-  function getIsiriCallSQL($pattern, $context) {
-    return $this->getHasTypeCallSQL($pattern, $context, 0);
-  }
-
-  function getIsuriCallSQL($pattern, $context) {
-    return $this->getHasTypeCallSQL($pattern, $context, 0);
-  }
-
-  function getStrCallSQL($pattern, $context) {
-    $sub_pattern = $pattern['args'][0];
-    $sub_type = $sub_pattern['type'];
-    $m = 'get' . ucfirst($sub_type) . 'ExpressionSQL';
-    if (method_exists($this, $m)) {
-      return $this->$m($sub_pattern, $context);
-    }
-  }
-  
-  function getFunctionCallSQL($pattern, $context) {
-    $f_uri = $pattern['uri'];
-    if (preg_match('/(integer|double|float|string)$/', $f_uri)) {/* skip conversions */
-      $sub_pattern = $pattern['args'][0];
-      $sub_type = $sub_pattern['type'];
-      $m = 'get' . ucfirst($sub_type) . 'ExpressionSQL';
-      if (method_exists($this, $m)) {
-        return $this->$m($sub_pattern, $context);
-      }
-    }
-  }
-  
-  function getLangDatatypeCallSQL($pattern, $context) {
-    $r = '';
-    if (isset($pattern['patterns'])) { /* proceed with first argument only (assumed as base type for type promotion) */
-      $sub_pattern = array('args' => array($pattern['patterns'][0]));
-      return $this->getLangDatatypeCallSQL($sub_pattern, $context);
-    }
-    if (!isset($pattern['args'])) {
-      return 'FALSE';
-    }
-    $sub_type = $pattern['args'][0]['type'];
-    if ($sub_type != 'var') {
-      return $this->getLangDatatypeCallSQL($pattern['args'][0], $context);
-    }
-    $var = $pattern['args'][0]['value'];
-    $info = $this->getVarTableInfos($var);
-    if (!$tbl = $info['table']) {
-      return '';
-    }
-    $col = 'o_lang_dt';
-    $tbl_alias = 'V_' . $tbl . '_' . $col . '.val';
-    if (!in_array($tbl_alias, $this->index['sub_joins'])) {
-      $this->index['sub_joins'][] = $tbl_alias;
-    }
-    $op = $this->v('operator', '', $pattern);
-    $r = trim($op . ' ' . $tbl_alias);
-    return $r;
-  }
-
-  function getDatatypeCallSQL($pattern, $context) {
-    return '/* datatype call */ ' . $this->getLangDatatypeCallSQL($pattern, $context);
-  }
-
-  function getLangCallSQL($pattern, $context) {
-    return '/* language call */ ' . $this->getLangDatatypeCallSQL($pattern, $context);
-  }
-  
-  function getLangmatchesCallSQL($pattern, $context) {
-    if (count($pattern['args']) == 2) {
-      $arg_1 = $pattern['args'][0];
-      $arg_2 = $pattern['args'][1];
-      $sub_r_1 = $this->getBuiltInCallSQL($arg_1, $context);/* adds value join */
-      $sub_r_2 = $this->getExpressionSQL($arg_2, $context);
-      $op = $this->v('operator', '', $pattern);
-      if (preg_match('/^([\"\'])([^\'\"]+)/', $sub_r_2, $m)) {
-        if ($m[2] == '*') {
-          $r = ($op == '!') ? 'NOT (' . $sub_r_1 . ' REGEXP "^[a-zA-Z\-]+$"' . ')' : $sub_r_1 . ' REGEXP "^[a-zA-Z\-]+$"';
-        }
-        else {
-          $r = ($op == '!') ? $sub_r_1 . ' NOT LIKE ' . $m[1] . $m[2] . '%' . $m[1] : $sub_r_1 . ' LIKE ' . $m[1] . $m[2] . '%' . $m[1];
-        }
-      }
-      else {
-        $r = ($op == '!') ? $sub_r_1 . ' NOT LIKE CONCAT(' . $sub_r_2 . ', "%")' : $sub_r_1 . ' LIKE CONCAT(' . $sub_r_2 . ', "%")';
-      }
-      return $r;
-    }
-    return '';
-  }
-  
-  function getSametermCallSQL($pattern, $context) {
-    if (count($pattern['args']) == 2) {
-      $arg_1 = $pattern['args'][0];
-      $arg_2 = $pattern['args'][1];
-      $sub_r_1 = $this->getExpressionSQL($arg_1, 'sameterm');
-      $sub_r_2 = $this->getExpressionSQL($arg_2, 'sameterm');
-      $op = $this->v('operator', '', $pattern);
-      $r = $sub_r_1 . ' ' . $op . '= ' . $sub_r_2;
-      return $r;
-    }
-    return '';
-  }
-  
-  function getRegexCallSQL($pattern, $context) {
-    $ac = count($pattern['args']);
-    if ($ac >= 2) {
-      foreach ($pattern['args'] as $i => $arg) {
-        $var = 'sub_r_' . ($i + 1);
-        $$var = $this->getExpressionSQL($arg, $context, '', 'regex');
-      }
-      $sub_r_3 = (isset($sub_r_3) && preg_match('/[\"\'](.+)[\"\']/', $sub_r_3, $m)) ? strtolower($m[1]) : '';
-      $op = ($this->v('operator', '', $pattern) == '!') ? ' NOT' : '';
-      if (!$sub_r_1 || !$sub_r_2) return '';
-      $is_simple_search = preg_match('/^[\(\"]+(\^)?([a-z0-9\_\-\s]+)(\$)?[\)\"]+$/is', $sub_r_2, $m);
-      $is_simple_search = preg_match('/^[\(\"]+(\^)?([^\\\*\[\]\}\{\(\)\"\'\?\+\.]+)(\$)?[\)\"]+$/is', $sub_r_2, $m);
-      $is_o_search = preg_match('/o\.val\)*$/', $sub_r_1);
-      /* fulltext search (may have "|") */
-      if ($is_simple_search && $is_o_search && !$op && (strlen($m[2]) > 8) && $this->store->hasFulltextIndex()) {
-        /* MATCH variations */
-        if (($val_parts = preg_split('/\|/', $m[2]))) {
-          return 'MATCH(' . trim($sub_r_1, '()') . ') AGAINST("' . join(' ', $val_parts) . '")';
-        }
-        else {
-          return 'MATCH(' . trim($sub_r_1, '()') . ') AGAINST("' . $m[2] . '")';
-        }
-      }
-      if (preg_match('/\|/', $sub_r_2)) $is_simple_search = 0;
-      /* LIKE */
-      if ($is_simple_search && ($sub_r_3 == 'i')) {
-        $sub_r_2 = $m[1] ? $m[2] : '%' . $m[2];
-        $sub_r_2 .= isset($m[3]) && $m[3] ? '' : '%';
-        return $sub_r_1 . $op . ' LIKE "' . $sub_r_2 . '"';
-      }
-      /* REGEXP */
-      $opt = ($sub_r_3 == 'i') ? '' : 'BINARY ';
-      return $sub_r_1 . $op . ' REGEXP ' . $opt . $sub_r_2;
-    }
-    return '';
-  }
-  
-  /*  */
-
-  function getGROUPSQL() {
-    $r = '';
-    $nl = "\n";
-    $infos = $this->v('group_infos', array(), $this->infos['query']);
-    foreach ($infos as $info) {
-      $var = $info['value'];
-      if ($tbl_infos = $this->getVarTableInfos($var, 0)) {
-        $tbl_alias = $tbl_infos['table_alias'];
-        $r .= $r ? ', ' : 'GROUP BY '; 
-        $r .= $tbl_alias;
-      }
-    }
-    $hr = '';
-    foreach ($this->index['havings'] as $having) {
-      $hr .= $hr ? ' AND' : ' HAVING';
-      $hr .= '(' . $having . ')';
-    }
-    $r .= $hr;
-    return $r ? $nl . $r : $r;
-  }
-  
-  /*  */
-  
-  function getORDERSQL() {
-    $r = '';
-    $nl = "\n";
-    $infos = $this->v('order_infos', array(), $this->infos['query']);
-    foreach ($infos as $info) {
-      $type = $info['type'];
-      $ms = array('expression' => 'getExpressionSQL', 'built_in_call' => 'getBuiltInCallSQL', 'function_call' => 'getFunctionCallSQL');
-      $m = isset($ms[$type]) ? $ms[$type] : 'get' . ucfirst($type) . 'ExpressionSQL';
-      if (method_exists($this, $m)) {
-        $sub_r = '(' . $this->$m($info, 'order') . ')';
-        $sub_r .= $this->v('direction', '', $info) == 'desc' ? ' DESC' : '';
-        $r .= $r ? ',' .$nl . $sub_r : $sub_r;
-      }
-    }
-    return $r ? $nl . 'ORDER BY ' . $r : '';
-  }
-  
-  /*  */
-  
-  function getLIMITSQL() {
-    $r = '';
-    $nl = "\n";
-    $limit = $this->v('limit', -1, $this->infos['query']);
-    $offset = $this->v('offset', -1, $this->infos['query']);
-    if ($limit != -1) {
-      $offset = ($offset == -1) ? 0 : mysql_real_escape_string($offset, $this->store->getDBCon());
-      $r = 'LIMIT ' . $offset . ',' . $limit; 
-    }
-    elseif ($offset != -1) {
-      $r = 'LIMIT ' . mysql_real_escape_string($offset, $this->store->getDBCon()) . ',999999999999'; /* mysql doesn't support stand-alone offsets .. */
-    }
-    return $r ? $nl . $r : '';
-  }
-
-  /*  */
-  
-  function getValueSQL($q_tbl, $q_sql) {
-    $r = '';
-    /* result vars */
-    $vars = $this->infos['query']['result_vars'];
-    $nl = "\n";
-    $v_tbls = array('JOIN' => array(), 'LEFT JOIN' => array());
-    $vc = 1;
-    foreach ($vars as $var) {
-      $var_name = $var['var'];
-      $r .= $r ? ',' . $nl . '  ' : '  ';
-      $col = '';
-      $tbl = '';
-      if ($var_name != '*') {
-        if (in_array($var_name, $this->infos['null_vars'])) {
-          if (isset($this->initial_index['vars'][$var_name])) {
-            $col = $this->initial_index['vars'][$var_name][0]['col'];
-            $tbl = $this->initial_index['vars'][$var_name][0]['table'];
-          }
-          if (isset($this->initial_index['graph_vars'][$var_name])) {
-            $col = 'g';
-            $tbl = $this->initial_index['graph_vars'][$var_name][0]['table'];
-          }
-        }
-        elseif (isset($this->index['vars'][$var_name])) {
-          $col = $this->index['vars'][$var_name][0]['col'];
-          $tbl = $this->index['vars'][$var_name][0]['table'];
-        }
-      }
-      if ($var['aggregate']) {
-        $r .= 'TMP.`' . $var['alias'] . '`';
-      }
-      else {
-        $join_type = in_array($tbl, array_merge($this->index['from'], $this->index['join'])) ? 'JOIN' : 'LEFT JOIN';/* val may be NULL */
-        $v_tbls[$join_type][] = array('t_col' => $col, 'q_col' => $var_name, 'vc' => $vc);
-        $r .= 'V' . $vc . '.val AS `' . $var_name . '`';
-        if (in_array($col, array('s', 'o'))) {
-          if (strpos($q_sql, '`' . $var_name . ' type`')) {
-            $r .= ', ' . $nl . '    TMP.`' . $var_name . ' type` AS `' . $var_name . ' type`';
-            //$r .= ', ' . $nl . '    CASE TMP.`' . $var_name . ' type` WHEN 2 THEN "literal" WHEN 1 THEN "bnode" ELSE "uri" END AS `' . $var_name . ' type`';
-          }
-          else {
-            $r .= ', ' . $nl . '    NULL AS `' . $var_name . ' type`';
-          }
-        }
-        $vc++;
-        if ($col == 'o') {
-          $v_tbls[$join_type][] = array('t_col' => 'id', 'q_col' => $var_name . ' lang_dt', 'vc' => $vc);
-          if (strpos($q_sql, '`' . $var_name . ' lang_dt`')) {
-            $r .= ', ' .$nl. '    V' . $vc . '.val AS `' . $var_name . ' lang_dt`';
-            $vc++;
-          }
-          else {
-            $r .= ', ' .$nl. '    NULL AS `' . $var_name . ' lang_dt`';
-          }
-        }
-      }
-    }
-    if (!$r) $r = '*';
-    /* from */
-    $r .= $nl . 'FROM (' . $q_tbl . ' TMP)';
-    foreach (array('JOIN', 'LEFT JOIN') as $join_type) {
-      foreach ($v_tbls[$join_type] as $v_tbl) {
-        $tbl = $this->getValueTable($v_tbl['t_col']);
-        $var_name = preg_replace('/^([^\s]+)(.*)$/', '\\1', $v_tbl['q_col']);
-        $cur_join_type = in_array($var_name, $this->infos['null_vars']) ? 'LEFT JOIN' : $join_type;
-        if (!strpos($q_sql, '`' . $v_tbl['q_col'].'`')) continue;
-        $r .= $nl . ' ' . $cur_join_type . ' ' . $tbl . ' V' . $v_tbl['vc'] . ' ON (
-            (V' . $v_tbl['vc'] . '.id = TMP.`' . $v_tbl['q_col'].'`)
-        )';
-      }
-    }
-    
-    /* create pos columns, id needed */
-    if ($this->v('order_infos', array(), $this->infos['query'])) {
-      $r .= $nl . ' ORDER BY _pos_';
-    }
-    return 'SELECT' . $nl . $r;
-  }
-  
-  /*  */
-
-}
-
-
diff --git a/libraries/ARC2/store/ARC2_StoreSemHTMLLoader.php b/libraries/ARC2/store/ARC2_StoreSemHTMLLoader.php
deleted file mode 100644
index 187c63fc6..000000000
--- a/libraries/ARC2/store/ARC2_StoreSemHTMLLoader.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store SemHTML Loader
-author:   Benjamin Nowack
-version:  2008-06-28 (Tweak: adjusted to normalized "literal" type)
-*/
-
-ARC2::inc('SemHTMLParser');
-
-class ARC2_StoreSemHTMLLoader extends ARC2_SemHTMLParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function done() {
-    $this->extractRDF();
-  }
-  
-  function addT($t) {
-    $this->caller->addT($t['s'], $t['p'], $t['o'], $t['s_type'], $t['o_type'], $t['o_datatype'], $t['o_lang']);
-    $this->t_count++;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreTableManager.php b/libraries/ARC2/store/ARC2_StoreTableManager.php
deleted file mode 100644
index e7086eafe..000000000
--- a/libraries/ARC2/store/ARC2_StoreTableManager.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/**
- * ARC2 RDF Store Table Manager
- *
- * @license   http://arc.semsol.org/license
- * @author    Benjamin Nowack
- * @version   2010-06-21
- *
-*/
-
-ARC2::inc('Store');
-
-class ARC2_StoreTableManager extends ARC2_Store {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {/* db_con */
-    parent::__init();
-    $this->engine_type = $this->v('store_engine_type', 'MyISAM', $this->a);
-  }
-
-  /*  */
-  
-  function getTableOptionsCode() {
-    $v = $this->getDBVersion();
-    $r = "";
-    $r .= (($v < '04-01-00') && ($v >= '04-00-18')) ? 'ENGINE' : (($v >= '04-01-02') ? 'ENGINE' : 'TYPE');
-    $r .= "=" . $this->engine_type;
-    $r .= ($v >= '04-00-00') ? " CHARACTER SET utf8" : "";
-    $r .= ($v >= '04-01-00') ? " COLLATE utf8_unicode_ci" : "";
-    $r .= " DELAY_KEY_WRITE = 1";
-    return $r;
-  }
-  
-  /*  */
-  
-  function createTables() {
-    $con = $this->getDBCon();
-    if(!$this->createTripleTable()) {
-      return $this->addError('Could not create "triple" table (' . mysql_error($con) . ').');
-    }
-    if(!$this->createG2TTable()) {
-      return $this->addError('Could not create "g2t" table (' . mysql_error($con) . ').');
-    }
-    if(!$this->createID2ValTable()) {
-      return $this->addError('Could not create "id2val" table (' . mysql_error($con) . ').');
-    }
-    if(!$this->createS2ValTable()) {
-      return $this->addError('Could not create "s2val" table (' . mysql_error($con) . ').');
-    }
-    if(!$this->createO2ValTable()) {
-      return $this->addError('Could not create "o2val" table (' . mysql_error($con) . ').');
-    }
-    if(!$this->createSettingTable()) {
-      return $this->addError('Could not create "setting" table (' . mysql_error($con) . ').');
-    }
-    return 1;
-  }
-  
-  /*  */
-  
-  function createTripleTable($suffix = 'triple') {
-    /* keep in sync with merge def in StoreQueryHandler ! */
-    $indexes = $this->v('store_indexes', array('sp (s,p)', 'os (o,s)', 'po (p,o)'), $this->a);
-    $index_code = $indexes ? 'KEY ' . join(', KEY ',  $indexes) . ', ' : '';
-    $sql = "
-      CREATE TABLE IF NOT EXISTS " . $this->getTablePrefix() . $suffix . " (
-        t mediumint UNSIGNED NOT NULL,
-        s mediumint UNSIGNED NOT NULL,
-        p mediumint UNSIGNED NOT NULL,
-        o mediumint UNSIGNED NOT NULL,
-        o_lang_dt mediumint UNSIGNED NOT NULL,
-        o_comp char(35) NOT NULL,                   /* normalized value for ORDER BY operations */
-        s_type tinyint(1) NOT NULL default 0,       /* uri/bnode => 0/1 */
-        o_type tinyint(1) NOT NULL default 0,       /* uri/bnode/literal => 0/1/2 */
-        misc tinyint(1) NOT NULL default 0,         /* temporary flags */
-        UNIQUE KEY (t), " . $index_code . " KEY (misc)
-      ) ". $this->getTableOptionsCode() . "
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }
-
-  function extendTripleTableColumns($suffix = 'triple') {
-    $sql = "
-      ALTER TABLE " . $this->getTablePrefix() . $suffix . "
-      MODIFY t int(10) UNSIGNED NOT NULL,
-      MODIFY s int(10) UNSIGNED NOT NULL,
-      MODIFY p int(10) UNSIGNED NOT NULL,
-      MODIFY o int(10) UNSIGNED NOT NULL,
-      MODIFY o_lang_dt int(10) UNSIGNED NOT NULL
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }
-  
-  /*  */
-  
-  function createG2TTable() {
-    $sql = "
-      CREATE TABLE IF NOT EXISTS " . $this->getTablePrefix() . "g2t (
-        g mediumint UNSIGNED NOT NULL,
-        t mediumint UNSIGNED NOT NULL,
-        UNIQUE KEY gt (g,t), KEY tg (t,g)
-      ) ". $this->getTableOptionsCode() . "
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }  
-  
-  function extendG2tTableColumns($suffix = 'g2t') {
-    $sql = "
-      ALTER TABLE " . $this->getTablePrefix() . $suffix . "
-      MODIFY g int(10) UNSIGNED NOT NULL,
-      MODIFY t int(10) UNSIGNED NOT NULL
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }
-
-  /*  */
-  
-  function createID2ValTable() {
-    $sql = "
-      CREATE TABLE IF NOT EXISTS " . $this->getTablePrefix() . "id2val (
-        id mediumint UNSIGNED NOT NULL,
-        misc tinyint(1) NOT NULL default 0,
-        val text NOT NULL,
-        val_type tinyint(1) NOT NULL default 0,     /* uri/bnode/literal => 0/1/2 */
-        UNIQUE KEY (id,val_type), KEY v (val(64))
-      ) ". $this->getTableOptionsCode() . "
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }  
-  
-  function extendId2valTableColumns($suffix = 'id2val') {
-    $sql = "
-      ALTER TABLE " . $this->getTablePrefix() . $suffix . "
-      MODIFY id int(10) UNSIGNED NOT NULL
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }
-
-  /*  */
-  
-  function createS2ValTable() {
-    //$indexes = 'UNIQUE KEY (id), KEY vh (val_hash), KEY v (val(64))';
-    $indexes = 'UNIQUE KEY (id), KEY vh (val_hash)';
-    $sql = "
-      CREATE TABLE IF NOT EXISTS " . $this->getTablePrefix() . "s2val (
-        id mediumint UNSIGNED NOT NULL,
-        misc tinyint(1) NOT NULL default 0,
-        val_hash char(32) NOT NULL,
-        val text NOT NULL,
-        " . $indexes . "
-      ) " . $this->getTableOptionsCode() . "
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }  
-  
-  function extendS2valTableColumns($suffix = 's2val') {
-    $sql = "
-      ALTER TABLE " . $this->getTablePrefix() . $suffix . "
-      MODIFY id int(10) UNSIGNED NOT NULL
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }
-
-  /*  */
-  
-  function createO2ValTable() {
-    /* object value index, e.g. "KEY v (val(64))" and/or "FULLTEXT KEY vft (val)" */
-    $val_index = $this->v('store_object_index', 'KEY v (val(64))', $this->a);
-    if ($val_index) $val_index = ', ' . ltrim($val_index, ',');
-    $sql = "
-      CREATE TABLE IF NOT EXISTS " . $this->getTablePrefix() . "o2val (
-        id mediumint UNSIGNED NOT NULL,
-        misc tinyint(1) NOT NULL default 0,
-        val_hash char(32) NOT NULL,
-        val text NOT NULL,
-        UNIQUE KEY (id), KEY vh (val_hash)" . $val_index . "
-      ) ". $this->getTableOptionsCode() . "
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }  
-  
-  function extendO2valTableColumns($suffix = 'o2val') {
-    $sql = "
-      ALTER TABLE " . $this->getTablePrefix() . $suffix . "
-      MODIFY id int(10) UNSIGNED NOT NULL
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }
-
-  /*  */
-  
-  function createSettingTable() {
-    $sql = "
-      CREATE TABLE IF NOT EXISTS " . $this->getTablePrefix() . "setting (
-        k char(32) NOT NULL,
-        val text NOT NULL,
-        UNIQUE KEY (k)
-      ) ". $this->getTableOptionsCode() . "
-    ";
-    return mysql_query($sql, $this->getDBCon());
-  }  
-  
-  /*  */
-
-  function extendColumns() {
-    $con = $this->getDBCon();
-    $tbl_prefix = $this->getTablePrefix();
-    $tbls = $this->getTables();
-    foreach ($tbls as $suffix) {
-      if (preg_match('/^(triple|g2t|id2val|s2val|o2val)/', $suffix, $m)) {
-        $mthd = 'extend' . ucfirst($m[1]) . 'TableColumns';
-        $this->$mthd($suffix);
-      }
-    }
-  }
-
-  /*  */
-
-  function splitTables() {
-    $old_ps = $this->getSetting('split_predicates', array());
-    $new_ps = $this->retrieveSplitPredicates();
-    $add_ps = array_diff($new_ps, $old_ps);
-    $del_ps = array_diff($old_ps, $new_ps);
-    $final_ps = array();
-    foreach ($del_ps as $p) {
-      if (!$this->unsplitPredicate($p)) $final_ps[] = $p;
-    }
-    foreach ($add_ps as $p) {
-      if ($this->splitPredicate($p)) $final_ps[] = $p;
-    }
-    $this->setSetting('split_predicates', $new_ps);
-  }
-
-  function unsplitPredicate($p) {
-    $suffix = 'triple_' . abs(crc32($p));
-    $old_tbl = $this->getTablePrefix() . $suffix;
-    $new_tbl = $this->getTablePrefix() . 'triple';
-    $p_id = $this->getTermID($p, 'p');
-    $con = $this->getDBCon();
-    $sql = '
-      INSERT IGNORE INTO ' . $new_tbl .'
-      SELECT * FROM ' . $old_tbl . ' WHERE ' . $old_tbl . '.p = ' . $p_id . '
-    ';
-    if ($rs = mysql_query($sql, $con)) {
-      mysql_query('DROP TABLE ' . $old_tbl, $con);
-      return 1;
-    }
-    else {
-      return 0;
-    }
-  }
-
-  function splitPredicate($p) {
-    $suffix = 'triple_' . abs(crc32($p));
-    $this->createTripleTable($suffix);
-    $old_tbl = $this->getTablePrefix() . 'triple';
-    $new_tbl = $this->getTablePrefix() . $suffix;
-    $p_id = $this->getTermID($p, 'p');
-    $con = $this->getDBCon();
-    $sql = '
-      INSERT IGNORE INTO ' . $new_tbl .'
-      SELECT * FROM ' . $old_tbl . ' WHERE ' . $old_tbl . '.p = ' . $p_id . '
-    ';
-    if ($rs = mysql_query($sql, $con)) {
-      mysql_query('DELETE FROM ' . $old_tbl . ' WHERE ' . $old_tbl . '.p = ' . $p_id, $con);
-      return 1;
-    }
-    else {
-      mysql_query('DROP TABLE ' . $new_tbl, $con);
-      return 0;
-    }
-  }
-
-  function retrieveSplitPredicates() {
-    $r = $this->split_predicates;
-    $limit = $this->max_split_tables - count($r);
-    $q = 'SELECT ?p COUNT(?p) AS ?pc WHERE { ?s ?p ?o } GROUP BY ?p ORDER BY DESC(?pc) LIMIT ' . $limit;
-    $rows = $this->query($q, 'rows');
-    foreach ($rows as $row) {
-      $r[] = $row['p'];
-    }
-    return $r;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/ARC2/store/ARC2_StoreTurtleLoader.php b/libraries/ARC2/store/ARC2_StoreTurtleLoader.php
deleted file mode 100644
index 080bf6c7d..000000000
--- a/libraries/ARC2/store/ARC2_StoreTurtleLoader.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-homepage: http://arc.semsol.org/
-license:  http://arc.semsol.org/license
-
-class:    ARC2 Store Turtle Loader
-author:   Benjamin Nowack
-version:  2008-06-28 (Tweak: adjusted to normalized "literal" type)
-*/
-
-ARC2::inc('TurtleParser');
-
-class ARC2_StoreTurtleLoader extends ARC2_TurtleParser {
-
-  function __construct($a = '', &$caller) {
-    parent::__construct($a, $caller);
-  }
-  
-  function __init() {
-    parent::__init();
-  }
-
-  /*  */
-  
-  function addT($t) {
-    $this->caller->addT($t['s'], $t['p'], $t['o'], $t['s_type'], $t['o_type'], $t['o_datatype'], $t['o_lang']);
-    $this->t_count++;
-  }
-
-  /*  */
-
-}
diff --git a/libraries/Erfurt b/libraries/Erfurt
deleted file mode 160000
index 4e5f0a515..000000000
--- a/libraries/Erfurt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4e5f0a51584311b2b040e301210bf598bcbe90b2
diff --git a/libraries/Mimeparse.php b/libraries/Mimeparse.php
deleted file mode 100644
index e8fa22903..000000000
--- a/libraries/Mimeparse.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * Mimeparser class. This class provides basic functions for handling mime-types. It can
- * handle matching mime-types against a list of media-ranges. See section
- * 14.1 of the HTTP specification [RFC 2616] for a complete explanation. 
- * 
- * It's just a port to php from original
- * Python code (http://code.google.com/p/mimeparse/)
- * @author Joe Gregario, Andrew "Venom" K.
- * 
- * ported from version 0.1.2
- * 
- * Comments are mostly excerpted from the original.
- */
-class Mimeparse {        
-    /**
-     * Carves up a mime-type and returns an Array of the [type, subtype, params] 
-     * where "params" is a Hash of all the parameters for the media range.
-     *
-     * For example, the media range "application/xhtml;q=0.5" would
-     * get parsed into:
-     *
-     * array("application", "xhtml", array( "q" => "0.5" )) 
-     *
-     * @param string $mime_type
-     * @return array ($type, $subtype, $params)
-     */
-    public static function parse_mime_type($mime_type) {
-      $parts = explode(";", $mime_type);
-      
-      $params = array();
-      foreach ($parts as $i=>$param) {
-        if (strpos($param, '=') !== false) {
-            list ($k, $v) = explode('=', trim($param));
-            $params[$k] = $v;
-        }
-      }
-
-      $full_type = trim($parts[0]);
-      /* Java URLConnection class sends an Accept header that includes a single "*"
-         Turn it into a legal wildcard. */
-      if ($full_type == '*') {
-          $full_type = '*/*';
-      }
-      list ($type, $subtype) = explode('/', $full_type);
-      if (!$subtype) throw (new Exception("malformed mime type"));
-    
-      return array(trim($type), trim($subtype), $params);
-    }
-    
-    
-    /**
-     * Carves up a media range and returns an Array of the
-     * [type, subtype, params] where "params" is a Hash of all
-     * the parameters for the media range.
-     *
-     * For example, the media range "application/*;q=0.5" would
-     * get parsed into:
-     *
-     * array("application", "*", ( "q", "0.5" ))
-     *
-     * In addition this function also guarantees that there
-     * is a value for "q" in the params dictionary, filling it
-     * in with a proper default if necessary. 
-     *
-     * @param string $range
-     * @return array ($type, $subtype, $params)
-     */
-    public static function parse_media_range($range) {
-      list ($type, $subtype, $params) = self::parse_mime_type($range);
-      
-      if (!(isset($params['q']) && $params['q'] && floatval($params['q']) &&
-        floatval($params['q']) <= 1 && floatval($params['q']) >= 0))
-            $params['q'] = '1';
-      
-      return array($type, $subtype, $params);
-    }
-    
-    /**
-     * Find the best match for a given mime-type against a list of
-     * media_ranges that have already been parsed by Mimeparser::parse_media_range()
-     *
-     * Returns the fitness and the "q" quality parameter of the best match, or an
-     * array [-1, 0] if no match was found. Just as for Mimeparser::quality(),
-     * "parsed_ranges" must be an Enumerable of parsed media ranges. 
-     *
-     * @param string $mime_type
-     * @param array  $parsed_ranges
-     * @return array ($best_fitness, $best_fit_q)
-     */
-    public static function fitness_and_quality_parsed($mime_type, $parsed_ranges) {
-      $best_fitness = -1;
-      $best_fit_q   = 0;
-      list ($target_type, $target_subtype, $target_params) = self::parse_media_range($mime_type);
-    
-      foreach ($parsed_ranges as $item) {
-        list ($type, $subtype, $params) = $item;
-
-        if (($type == $target_type or $type == "*" or $target_type == "*") &&
-            ($subtype == $target_subtype or $subtype == "*" or $target_subtype == "*")) {
-    
-          $param_matches = 0;
-          foreach ($target_params as $k=>$v) {
-            if ($k != 'q' && isset($params[$k]) && $v == $params[$k])
-              $param_matches++;
-          }
-        
-          $fitness  = ($type == $target_type) ? 100 : 0;
-          $fitness += ($subtype == $target_subtype) ? 10 : 0;
-          $fitness += $param_matches;
-    
-          if ($fitness > $best_fitness) {
-            $best_fitness = $fitness;
-            $best_fit_q   = $params['q'];
-          }
-        }
-      }
-    
-      return array( $best_fitness, (float) $best_fit_q );
-    }
-    
-    /**
-     * Find the best match for a given mime-type against a list of
-     * media_ranges that have already been parsed by Mimeparser::parse_media_range()
-     *
-     * Returns the "q" quality parameter of the best match, 0 if no match
-     * was found. This function behaves the same as Mimeparser::quality() except that
-     * "parsed_ranges" must be an Enumerable of parsed media ranges. 
-     *
-     * @param string $mime_type
-     * @param array  $parsed_ranges
-     * @return float $q
-     */
-    public static function quality_parsed($mime_type, $parsed_ranges) {
-      list ($fitness, $q) = self::fitness_and_quality_parsed($mime_type, $parsed_ranges);
-      return $q;
-    }
-    
-    /**
-     * Returns the quality "q" of a mime-type when compared against
-     * the media-ranges in ranges. For example:
-     *
-     * Mimeparser::quality("text/html", "text/*;q=0.3, text/html;q=0.7, 
-     * text/html;level=1, text/html;level=2;q=0.4, *\/*;q=0.5")
-     * => 0.7 
-     *
-     * @param unknown_type $mime_type
-     * @param unknown_type $ranges
-     * @return unknown
-     */
-    public static function quality($mime_type, $ranges) {
-      $parsed_ranges = explode(',', $ranges);
-      
-      foreach ($parsed_ranges as $i=>$r)
-          $parsed_ranges[ $i ] = self::parse_media_range($r);
-      
-      return self::quality_parsed($mime_type, $parsed_ranges);
-    }
-    
-    /**
-     * Takes a list of supported mime-types and finds the best match
-     * for all the media-ranges listed in header. The value of header
-     * must be a string that conforms to the format of the HTTP Accept:
-     * header. The value of supported is an Enumerable of mime-types
-     *
-     * Mimeparser::best_match(array("application/xbel+xml", "text/xml"), "text/*;q=0.5,*\/*; q=0.1")
-     * => "text/xml"
-     *
-     * @param  array  $supported
-     * @param  string $header
-     * @return mixed  $mime_type or NULL 
-     */
-    public static function best_match($supported, $header) {
-      $parsed_header = explode(',', $header);
-      
-      foreach ($parsed_header as $i=>$r)
-          $parsed_header[ $i ] = self::parse_media_range($r);
-        
-      $weighted_matches = array();
-      foreach ($supported as $mime_type) {
-          $weighted_matches[] = array(
-            self::fitness_and_quality_parsed($mime_type, $parsed_header),
-            $mime_type
-          );
-      }
-    
-      array_multisort($weighted_matches);
-
-      $a = $weighted_matches[ count($weighted_matches) - 1 ];
-      return ( empty( $a[0][1] ) ? null :  $a[1] );
-    }
-}
diff --git a/libraries/RDFauthor b/libraries/RDFauthor
deleted file mode 160000
index a0a1ca71e..000000000
--- a/libraries/RDFauthor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a0a1ca71ea8ecd548939a85b1b0d2261234975e4
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000000000..0a0d208c6
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<ruleset name="OntoWikiCS">
+    <description>The combination of codingstandards used for Ontowiki.</description>
+
+    <file>./application/</file>
+    <file>./extensions/</file>
+
+    <arg name="extensions" value="php" />
+
+    <exclude-pattern>./application/tests/integration/OntoWiki/Extension/_files/test1/MoreModule.php</exclude-pattern>
+    <exclude-pattern>./application/tests/integration/OntoWiki/Extension/_files/test2/Test2Plugin.php</exclude-pattern>
+    <exclude-pattern>./application/scripts/</exclude-pattern>
+    <exclude-pattern>./extensions/exconf/pclzip.lib.php</exclude-pattern>
+    <exclude-pattern>./extensions/exconf/Archive.php</exclude-pattern>
+    <exclude-pattern>./extensions/markdown/parser/markdown.php</exclude-pattern>
+    <exclude-pattern>./extensions\/(?!account\/|application\/|auth\/|autologin\/|basicimporter\/|bookmarklet\/|ckan\/|community\/|cors\/|datagathering\/|defaultmodel\/|exconf\/|filter\/|googletracking\/|hideproperties\/|history\/|imagelink\/|imprint\/|jsonrpc\/|linkeddataserver\/|listmodules\/|literaltypes\/|mail\/|mailtolink\/|manchester\/|markdown\/|modellist\/|navigation\/|pingback\/|queries\/|resourcecreationuri\/|resourcemodules\/|savedqueries\/|selectlanguage\/|semanticsitemap\/|sendmail\/|sindice\/|sortproperties\/|source\/|themes\/|translations\/|weblink\/).*</exclude-pattern>
+
+    <!-- Generic sniffs -->
+    <rule ref="Generic.Classes.DuplicateClassName" />
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
+    <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" />
+    <!--<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter" />-->
+    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
+    <!--<rule ref="Generic.Commenting.Fixme" />-->
+    <!--<rule ref="Generic.Commenting.Todo" />-->
+    <rule ref="Generic.ControlStructures.InlineControlStructure" />
+    <rule ref="Generic.Files.ByteOrderMark" />
+    <rule ref="Generic.Files.EndFileNewline" />
+    <rule ref="Generic.Files.OneClassPerFile" />
+    <rule ref="Generic.Files.OneInterfacePerFile" />
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="100"/>
+            <property name="absoluteLineLimit" value="120"/>
+        </properties>
+    </rule>
+    <rule ref="Generic.Files.LineLength.TooLong">
+        <severity>3</severity>
+    </rule>
+    <rule ref="Generic.Files.LineEndings">
+        <properties>
+            <property name="eolChar" value="\n"/>
+        </properties>
+    </rule>
+    <rule ref="Generic.Files.LineEndings.InvalidEOLChar">
+        <severity>3</severity>
+    </rule>
+    <rule ref="Generic.Formatting.DisallowMultipleStatements" />
+    <!--<rule ref="Generic.Formatting.MultipleStatementAlignment" />-->
+    <rule ref="Generic.Formatting.NoSpaceAfterCast" />
+    <rule ref="Generic.Functions.CallTimePassByReference" />
+    <rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
+    <!--<rule ref="Generic.Metrics.CyclomaticComplexity" />-->
+    <!--<rule ref="Generic.Metrics.NestingLevel" />-->
+    <rule ref="Generic.NamingConventions.ConstructorName" />
+    <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
+    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
+    <rule ref="Generic.PHP.DeprecatedFunctions" />
+    <rule ref="Generic.PHP.DisallowShortOpenTag" />
+    <rule ref="Generic.PHP.LowerCaseConstant" />
+    <!--<rule ref="Generic.PHP.NoSilencedErrors" />-->
+    <!--<rule ref="Generic.Strings.UnnecessaryStringConcat" />-->
+    <rule ref="Generic.WhiteSpace.DisallowTabIndent" />
+
+    <!-- PEAR sniffs -->
+    <rule ref="PEAR.Classes.ClassDeclaration" />
+    <rule ref="PEAR.Commenting.InlineComment" />
+    <rule ref="PEAR.ControlStructures.ControlSignature" />
+    <rule ref="PEAR.ControlStructures.MultiLineCondition" />
+    <rule ref="PEAR.ControlStructures.MultiLineCondition.StartWithBoolean">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+    <!--<rule ref="PEAR.Files.IncludingFile" />-->
+    <rule ref="PEAR.Formatting.MultiLineAssignment" />
+    <rule ref="PEAR.Functions.FunctionCallSignature" />
+    <rule ref="PEAR.Functions.FunctionDeclaration" />
+    <rule ref="PEAR.Functions.ValidDefaultValue" />
+    <rule ref="PEAR.NamingConventions.ValidClassName" />
+    <rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
+    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace" />
+    <!--<rule ref="PEAR.WhiteSpace.ScopeIndent" />-->
+
+    <!-- Squiz -->
+    <rule ref="Squiz.Arrays.ArrayBracketSpacing" />
+    <!--<rule ref="Squiz.Arrays.ArrayDeclaration" />-->
+    <rule ref="Squiz.Classes.LowercaseClassKeywords" />
+    <rule ref="Squiz.Classes.SelfMemberReference" />
+    <rule ref="Squiz.Commenting.EmptyCatchComment" />
+    <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
+    <rule ref="Squiz.Functions.GlobalFunction">
+        <exclude-pattern>index.php</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Operators.IncrementDecrementUsage" />
+    <rule ref="Squiz.Operators.ValidLogicalOperators" />
+    <!--<rule ref="Squiz.PHP.CommentedOutCode" />-->
+    <!--<rule ref="Squiz.PHP.DisallowComparisonAssignment" />-->
+    <!--<rule ref="Squiz.PHP.DisallowMultipleAssignments" />-->
+    <rule ref="Squiz.PHP.DisallowObEndFlush" />
+    <rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops" />
+    <!--<rule ref="Squiz.PHP.DiscouragedFunctions" />-->
+    <rule ref="Squiz.PHP.EmbeddedPhp" />
+    <rule ref="Squiz.PHP.Eval" />
+    <rule ref="Squiz.PHP.ForbiddenFunctions" />
+    <rule ref="Squiz.PHP.GlobalKeyword" />
+    <rule ref="Squiz.PHP.Heredoc" />
+    <!--<rule ref="Squiz.PHP.InnerFunctions" />-->
+    <rule ref="Squiz.PHP.LowercasePHPFunctions" />
+    <rule ref="Squiz.PHP.NonExecutableCode" />
+    <rule ref="Squiz.Scope.MemberVarScope" />
+    <!--<rule ref="Squiz.Scope.MethodScope" />-->
+    <rule ref="Squiz.Scope.StaticThisUsage" />
+    <!--<rule ref="Squiz.Strings.DoubleQuoteUsage" />-->
+    <rule ref="Squiz.Strings.EchoedStrings" />
+    <!--<rule ref="Squiz.WhiteSpace.ControlStructureSpacing" />-->
+    <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace" />
+    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
+    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing" />
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing" />
+    <rule ref="Squiz.WhiteSpace.PropertyLabelSpacing" />
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
+    <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />
+    <rule ref="Squiz.WhiteSpace.SemicolonSpacing" />
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
+
+    <!-- Zend -->
+    <rule ref="Zend.Files.ClosingTag.NotAllowed">
+        <exclude-pattern>*/Sniffs/*</exclude-pattern>
+    </rule>
+    <rule ref="Zend.NamingConventions.ValidVariableName" />
+
+    <!-- OntoWiki cutom rules -->
+    <rule ref="./application/tests/CodeSniffer/Standards/Ontowiki/"/>
+    <rule ref="Ontowiki.Functions.ForbiddenFunctions">
+        <exclude-pattern>application/tests/Bootstrap.php</exclude-pattern>
+    </rule>
+    <rule ref="Ontowiki.Commenting.FileComment">
+        <exclude-pattern>extensions\/(?!account\/|application\/|auth\/|autologin\/|basicimporter\/|bookmarklet\/|ckan\/|community\/|cors\/|datagathering\/|defaultmodel\/|exconf\/|filter\/|googletracking\/|hideproperties\/|history\/|imagelink\/|imprint\/|jsonrpc\/|linkeddataserver\/|listmodules\/|literaltypes\/|mail\/|mailtolink\/|manchester\/|markdown\/|modellist\/|navigation\/|pingback\/|queries\/|resourcecreationuri\/|resourcemodules\/|savedqueries\/|selectlanguage\/|semanticsitemap\/|sendmail\/|sindice\/|sortproperties\/|source\/|themes\/|translations\/|weblink\/).*</exclude-pattern>
+    </rule>
+
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 000000000..c245da4c3
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+    bootstrap="./application/tests/Bootstrap.php"
+    colors="true"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    verbose="true">
+        <testsuite name="OntoWiki Unit Tests">
+            <directory suffix="Test.php">application/tests/unit</directory>
+        </testsuite>
+        <testsuite name="OntoWiki Virtuoso Integration Tests">
+            <directory suffix="Test.php">application/tests/integration</directory>
+        </testsuite>
+        <testsuite name="OntoWiki ZendDB Integration Tests">
+            <directory suffix="Test.php">application/tests/integration</directory>
+        </testsuite>
+        <testsuite name="OntoWiki Extensions Tests">
+            <directory suffix="Test.php">extensions/</directory>
+        </testsuite>
+        <logging>
+            <log type="coverage-clover" target="./build/logs/clover.xml"/>
+            <log type="coverage-html" target="./build/coverage" title="OntoWiki"/>
+            <log type="junit" target="./build/logs/junit.xml"/>
+        </logging>
+
+        <filter>
+            <whitelist processUncoveredFilesFromWhitelist="true">
+                <directory suffix=".php">./application</directory>
+
+                <exclude>
+                    <directory>./application/scripts</directory>
+                    <directory>./application/tests</directory>
+                    <directory>./application/shell.worker.client.php</directory>
+                    <directory>./application/shell.worker.php</directory>
+                </exclude>
+            </whitelist>
+        </filter>
+</phpunit>