no message
no message
Merge branch 'master' of https://github.com/dollarer/church

Conflicts:
	data/tpl_cache/admin_tpl_album.php
	data/tpl_cache/admin_tpl_blog.php
	data/tpl_cache/admin_tpl_comment.php
	data/tpl_cache/admin_tpl_doing.php
	data/tpl_cache/admin_tpl_index.php
	data/tpl_cache/admin_tpl_pic.php
	data/tpl_cache/admin_tpl_poll.php
	data/tpl_cache/admin_tpl_post.php
	data/tpl_cache/admin_tpl_thread.php
	data/tpl_cache/template_default_cp_profile.php