Attempted to fix conflicts.

[branch: development]

Conflicts:
	Documentation/classes.svg
	Documentation/classes/AisisCore_Exceptions_Exception.html
	Documentation/classes/AisisCore_Exceptions_ExceptionHandler.html
	Documentation/classes/AisisCore_Factory_Pattern.html
	Documentation/classes/AisisCore_FileHandling_File.html
	Documentation/classes/AisisCore_FileHandling_FileException.html
	Documentation/classes/AisisCore_Form_Element.html
	Documentation/classes/AisisCore_Form_Elements_Button.html
	Documentation/classes/AisisCore_Form_Elements_Checkbox.html
	Documentation/classes/AisisCore_Form_Elements_Content.html
	Documentation/classes/AisisCore_Form_Elements_Email.html
	Documentation/classes/AisisCore_Form_Elements_FileUpload.html
	Documentation/classes/AisisCore_Form_Elements_Input.html
	Documentation/classes/AisisCore_Form_Elements_Label.html
	Documentation/classes/AisisCore_Form_Elements_Password.html
	Documentation/classes/AisisCore_Form_Elements_Radio.html
	Documentation/classes/AisisCore_Form_Elements_Select.html
	Documentation/classes/AisisCore_Form_Elements_Submit.html
	Documentation/classes/AisisCore_Form_Elements_TextArea.html
	Documentation/classes/AisisCore_Form_Elements_Url.html
	Documentation/classes/AisisCore_Form_Form.html
	Documentation/classes/AisisCore_Form_SubSection.html
	Documentation/classes/AisisCore_Form_Xhtml.html
	Documentation/classes/AisisCore_Http_Http.html
	Documentation/classes/AisisCore_Interfaces_Activation.html
	Documentation/classes/AisisCore_Interfaces_Admin.html
	Documentation/classes/AisisCore_Interfaces_MultiSite.html
	Documentation/classes/AisisCore_Interfaces_Upgrade.html
	Documentation/classes/AisisCore_Interfaces_Upload.html
	Documentation/classes/AisisCore_Loader_Asset.html
	Documentation/classes/AisisCore_Loader_AutoLoader.html
	Documentation/classes/AisisCore_Loader_LoaderException.html
	Documentation/classes/AisisCore_Loader_Mixins.html
	Documentation/classes/AisisCore_Loader_Package.html
	Documentation/classes/AisisCore_Template_Builder.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Components_CoreComponents.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Components_Page.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Components_Single.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Loops_Page.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Loops_Single.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Mixins_LoopComponentsMixins.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Helpers_Mixins_LoopMixins.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_Loop.html
	Documentation/classes/AisisCore_Template_Helpers_Loop_LoopComponents.html
	Documentation/classes/AisisCore_Template_Options.html
	Documentation/classes/AisisCore_Template_OptionsException.html
	Documentation/classes/AisisCore_Template_Template.html
	Documentation/classes/AisisCore_Template_TemplateException.html
	Documentation/classes/AisisCore_Theme.html
	Documentation/deprecated.html
	Documentation/errors.html
	Documentation/graph_class.html
	Documentation/index.html
	Documentation/markers.html
	Documentation/namespaces/global.html
	Documentation/packages/AisisCore.html
	Documentation/packages/AisisCore_Exceptions.html
	Documentation/packages/AisisCore_Factory.html
	Documentation/packages/AisisCore_FileHandeling.html
	Documentation/packages/AisisCore_FileHandling.html
	Documentation/packages/AisisCore_Form.html
	Documentation/packages/AisisCore_Form_Elements.html
	Documentation/packages/AisisCore_Http.html
	Documentation/packages/AisisCore_Interfaces.html
	Documentation/packages/AisisCore_Loader.html
	Documentation/packages/AisisCore_Template.html
	Documentation/packages/AisisCore_Template_Helpers_Loop.html
	Documentation/packages/AisisCore_Template_Helpers_Loop_Helpers_Components.html
	Documentation/packages/AisisCore_Template_Helpers_Loop_Helpers_Mixins.html
	Documentation/packages/Default.html
	Documentation/phpdoc-cache-04/phpdoc-cache-file_cc6d912ac16789ba164310ab6d596717.dat
	Documentation/phpdoc-cache-08/phpdoc-cache-file_12c497c9055668805bb2ad92212d9870.dat
	Documentation/phpdoc-cache-0c/phpdoc-cache-file_9585e82513716f1d5e23f0e0931bc895.dat
	Documentation/phpdoc-cache-0d/phpdoc-cache-file_78ffa310f9066fd1c5ae151091d5ca07.dat
	Documentation/phpdoc-cache-16/phpdoc-cache-file_a3f01b8c095708571a42279e45daa53a.dat
	Documentation/phpdoc-cache-16/phpdoc-cache-file_b21be462370a5e441b675cbcd9b360f9.dat
	Documentation/phpdoc-cache-18/phpdoc-cache-file_744314b1bf688184d41e6cdab093062d.dat
	Documentation/phpdoc-cache-1e/phpdoc-cache-file_699ccc438ca8122fef30c242e6996700.dat
	Documentation/phpdoc-cache-1f/phpdoc-cache-file_6d5e6d76ddaffe6dd5c304af7df03894.dat
	Documentation/phpdoc-cache-26/phpdoc-cache-file_f50a28b6e5e577d45ca18e58e71fab24.dat
	Documentation/phpdoc-cache-32/phpdoc-cache-file_ae71108e1d09e3a29da5995487ad01bb.dat
	Documentation/phpdoc-cache-36/phpdoc-cache-file_93a8c3343db59f89ceac4067d8972ded.dat
	Documentation/phpdoc-cache-3a/phpdoc-cache-file_d76d8b92bbc2022bcd2532961b923f57.dat
	Documentation/phpdoc-cache-3d/phpdoc-cache-file_292a3239a86fa5d7532180e3fe943995.dat
	Documentation/phpdoc-cache-42/phpdoc-cache-file_5388410cf45ec7843365306ce94ef349.dat
	Documentation/phpdoc-cache-4b/phpdoc-cache-file_4752fa51fde3a1a115c3626ad5a1a388.dat
	Documentation/phpdoc-cache-58/phpdoc-cache-file_03c87b4ecbf6126e0e0c3886730624c7.dat
	Documentation/phpdoc-cache-62/phpdoc-cache-file_44dc42479551f45a3ce787482c6b83f2.dat
	Documentation/phpdoc-cache-65/phpdoc-cache-file_00ce7ed59a2a22b679ce0bcb9f8363d0.dat
	Documentation/phpdoc-cache-6d/phpdoc-cache-file_6e588cb23619e376f3732a8e0307c5a8.dat
	Documentation/phpdoc-cache-7f/phpdoc-cache-file_697299c1a639c74ff6a266fd4c7ab62d.dat
	Documentation/phpdoc-cache-83/phpdoc-cache-file_38c94cdb72a0b626d50cb1fe89e5e7a4.dat
	Documentation/phpdoc-cache-84/phpdoc-cache-file_7b8f8411cf36d4fdb1acb598dfcd307e.dat
	Documentation/phpdoc-cache-8b/phpdoc-cache-file_be0b692a9e3a9d5f723832ee7cfe9b8b.dat
	Documentation/phpdoc-cache-8e/phpdoc-cache-file_04637642338b6954d3e28ed8761cb72f.dat
	Documentation/phpdoc-cache-8f/phpdoc-cache-file_ccba0bb5a2cc1a375a98077c2cf43bf2.dat
	Documentation/phpdoc-cache-90/phpdoc-cache-file_2d582af48da191198626b750065b1a32.dat
	Documentation/phpdoc-cache-9a/phpdoc-cache-file_fa5bde55f10a70415d02b93efbfa4153.dat
	Documentation/phpdoc-cache-9e/phpdoc-cache-file_255368219b45ef7d5c14731f38e58a05.dat
	Documentation/phpdoc-cache-a4/phpdoc-cache-file_000bc1dbe10ddf1f9026791d53f3d8bb.dat
	Documentation/phpdoc-cache-a6/phpdoc-cache-file_6f542cedd676f7b099c3b462a99e82ac.dat
	Documentation/phpdoc-cache-a9/phpdoc-cache-file_283e61f36191a05efc92a1baeb65d494.dat
	Documentation/phpdoc-cache-b0/phpdoc-cache-file_789d5335029ed90b217caa7015e11bfa.dat
	Documentation/phpdoc-cache-b3/phpdoc-cache-file_f85b8c3dace3a874418079b81dc6bbb9.dat
	Documentation/phpdoc-cache-b5/phpdoc-cache-file_61f1b2b89c723ec22318d054bafb807d.dat
	Documentation/phpdoc-cache-b7/phpdoc-cache-file_d6e051d6437f260fd762f4d51193c323.dat
	Documentation/phpdoc-cache-bb/phpdoc-cache-file_30fbc61ec1192e545cf13dd2d376de61.dat
	Documentation/phpdoc-cache-bc/phpdoc-cache-file_82ce99cfb3b63f698e3edb3a303b4822.dat
	Documentation/phpdoc-cache-bf/phpdoc-cache-file_7a1bc08c4d221b4518559dd1b31994c1.dat
	Documentation/phpdoc-cache-c0/phpdoc-cache-file_c4e39f1219a59bc94c5822320aa22ece.dat
	Documentation/phpdoc-cache-d2/phpdoc-cache-file_5d077ca471d91f9e11df18cd18deab24.dat
	Documentation/phpdoc-cache-d2/phpdoc-cache-file_9d6ac9c519085f1b63dffe8dcc29ebe8.dat
	Documentation/phpdoc-cache-d3/phpdoc-cache-file_3eb9dc974449f8c5ce519ea921f62bbe.dat
	Documentation/phpdoc-cache-d6/phpdoc-cache-file_fccfd92b0ff7584b8074dd918714e1aa.dat
	Documentation/phpdoc-cache-e4/phpdoc-cache-file_857c584220a0240a786605c19f3edd9f.dat
	Documentation/phpdoc-cache-fb/phpdoc-cache-file_6d9a8628768f1518ad861e58ea347773.dat
	Documentation/phpdoc-cache-fd/phpdoc-cache-file_9553890fb81401e84513b611f889f1a2.dat
	Documentation/structure.xml
Added new documentation

[branch: development]