test commit
test commit
view change
delete log
Merge branch 'master' into develop

Conflicts:
	data/template/1_1_common_footer.tpl.php
	data/template/1_1_common_header_forum_forumdisplay.tpl.php
	data/template/1_1_common_header_forum_index.tpl.php
	data/template/1_1_common_header_forum_viewthread.tpl.php
	data/template/1_1_common_header_portal_index.tpl.php
	data/template/1_1_forum_viewthread_poll.tpl.php
	data/template/1_diy_forum_forumdisplay.tpl.php
	data/template/1_diy_forum_viewthread.tpl.php
fix
Delete 1_1_common_extcredits.tpl.php
Delete 1_1_common_extgroups.tpl.php
Delete 1_1_common_footer.tpl.php
Delete 1_1_common_footer_ajax.tpl.php
Delete 1_1_common_header_ajax.tpl.php
Delete 1_1_common_header_diy.tpl.php
Delete 1_1_common_header_diynav.tpl.php
Delete 1_1_common_header_forum_forumdisplay.tpl.php
Delete 1_1_common_header_forum_index.tpl.php
Delete 1_1_common_header_forum_post.tpl.php
Delete 1_1_common_header_forum_viewthread.tpl.php
Delete 1_1_common_header_home_space.tpl.php
Delete 1_1_common_header_home_spacecp.tpl.php
Delete 1_1_common_header_member_logging.tpl.php