no message
Merge remote-tracking branch 'Nicexm/master'

Conflicts:
	forum/tmp/bbs_control_hot_control.class.php
	forum/tmp/bbs_control_index_control.class.php
	forum/tmp/bbs_control_pm_control.class.php
	forum/tmp/control_common_control.class.php
	system/cache/cache.store.1414465833
Merge pull request #19 from Luobata/master

no message