tmp
Merge branch 'master' of https://github.com/fancystudio/fancystudio

Conflicts:

tmp/templates_c/15^f48edbbc04bfde01cbdbfa3ef9dec7c23ab66d68.content.page
data.php
	tmp/templates_c/2e8664ae74d7f34c9a5fecd71dc169bfe3508401.string.php

tmp/templates_c/931e1e9eac676a7613090088c9d8b4df6c1f1c50.tpl_head.24.php

tmp/templates_c/MleCMS^591545be6379901f35876d10e3f1960301dbc851.module_d
b_tpl.MleCMS;mle_templateSeparator.php

tmp/templates_c/ad83cfdd496e0d74150f5e8179bf0ea1e88e3ac2.tpl_body.24.php
	tmp/templates_c/d3dbaf6b27d7c8f9cc41110b8a8f02d60f1e7471.string.php
	tmp/templates_c/f38a13506d3ed3158f13dfc7e3c9098b848aa65a.tpl_top.24.php
	tmp/templates_c/fc8ddac4d81ff3d9b18e66d787573904fb1537de.string.php