Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)

Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html

modules/point/tpl/config.html

@@ -197,3 +197,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:포인트"></div>

modules/point/tpl/member_list.html

@@ -145,3 +145,5 @@
 	<input type="hidden" name="success_return_url" value="{Context::getRequestUrl()}" />
 	<input type="hidden" name="xe_validator_id" value="modules/point/tpl/member_list/1" />
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:포인트"></div>

modules/point/tpl/module_config.html

@@ -41,3 +41,5 @@
 		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_registration}" /></span>
 	</div>
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:포인트"></div>