fgh
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/cache/zend_cache---CONTROLLER_CACHE_08295dcb8a9343d6013b80d16f1ddc9c
	data/cache/zend_cache---CONTROLLER_CACHE_6666cd76f96956469e7be39d750cc7d9
	data/cache/zend_cache---Contents_Model_Mapper_Contents_fetchAll_bd6ef21fb86fd4cc97fefb817215476e
	data/cache/zend_cache---Contents_Model_Mapper_Contents_fetchPage_78e339d6e5e61365ef1ab9e1e08672e0
	data/cache/zend_cache---Media_Model_Mapper_Media_fetchAll_73980c64749f168015761cd752caacb5
	data/cache/zend_cache---Structure_Model_Mapper_Structure_fetchTree_23b108598c1ed71315b657cd7e17c220
	data/cache/zend_cache---internal-metadatas---15b8b1eea1bc42289a4d1db0c0e3ac20
	data/cache/zend_cache---internal-metadatas---22f2bba375c7a287528bd1ae0a754a28
	data/cache/zend_cache---internal-metadatas---385e531d193000bbb61dce25cb14e8d1
	data/cache/zend_cache---internal-metadatas---3faf71669ed2a3ebb16bb6e2a2813255
	data/cache/zend_cache---internal-metadatas---4822bee4ea7fa298be76a150b39e5dcb
	data/cache/zend_cache---internal-metadatas---51643875419fb38ec6bbeaba4db0f635
	data/cache/zend_cache---internal-metadatas---5a8fb473bb82129c5b7c287fdbb51600
	data/cache/zend_cache---internal-metadatas---61405b5cd25ba2ae178023bdc9c1986d
	data/cache/zend_cache---internal-metadatas---713d0b54c1e4211b531a9ccb2c6c7d04
	data/cache/zend_cache---internal-metadatas---7f7332f11bba81f315bf667fc31a25ec
	data/cache/zend_cache---internal-metadatas---8b063f586df08f7df5d1da42657ee84a
	data/cache/zend_cache---internal-metadatas---8fa60972bbcb91b6cdc1dfb5f0700a3f
	data/cache/zend_cache---internal-metadatas---CONTROLLER_CACHE_08295dcb8a9343d6013b80d16f1ddc9c
	data/cache/zend_cache---internal-metadatas---CONTROLLER_CACHE_6666cd76f96956469e7be39d750cc7d9
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsCategories_fetchAll_0179367bcf69ebb94dab8dee0352dde3
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsCategories_fetchAll_0e8fe06758b84e8328130d8cb688aec2
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsCategories_fetchAll_1dab208faaee2422a8db073eeba1eadd
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsCategories_fetchAll_6f9f9b78e59ec1366b0165d38057758a
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchAll_0e8fe06758b84e8328130d8cb688aec2
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchAll_40cd750bba9870f18aada2478b24840a
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchRow_424af9ad532a16cff3e41b38621624fa
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchRow_8e5a431a3a9beb2af61e5b65759cb55f
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchRow_dbe4447bb159989926655f82a1483571
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchRow_e139419323ea03293f392717c34baf7b
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_ContentsGroups_fetchRow_f01fc83a9876f665b9913406769d87b6
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchAll_64c0102fe6ab13ac8bbb352bf65c32e0
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchAll_87f6c5f2c37c1c1109cc9f1f66e735c4
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchAll_bd6ef21fb86fd4cc97fefb817215476e
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchPage_530cb27169bf59b656373268b18eb52c
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchPage_78e339d6e5e61365ef1ab9e1e08672e0
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchPage_bbbc82623d9d3b50a4f763c4a26417b6
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchRow_1d8555f962521cc03dc17e1ef0c5db6b
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Contents_fetchRow_a50063343966399581f4cdac13ec5187
	data/cache/zend_cache---internal-metadatas---Contents_Model_Mapper_Languages_fetchAll_0e8fe06758b84e8328130d8cb688aec2
	data/cache/zend_cache---internal-metadatas---Media_Model_Mapper_Media_fetchAll_73980c64749f168015761cd752caacb5
	data/cache/zend_cache---internal-metadatas---Structure_Model_Mapper_Structure_fetchTree_23b108598c1ed71315b657cd7e17c220
	data/cache/zend_cache---internal-metadatas---b6641cdaabf9ec70b8269ececf81890a
	data/cache/zend_cache---internal-metadatas---c84d614029127a9aa913e18a63badb6f
	data/cache/zend_cache---internal-metadatas---d3c2a2c9d237e1aebe5b8b86defb5146
	data/cache/zend_cache---internal-metadatas---ef3ed4bfb91033d8f277b8b0eaff61e6
Merge remote-tracking branch 'origin/master'
545
sdf