Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade

Conflicts:
	www/application/controllers/Auth.php

coregrade/src/config.status

@@ -421,7 +421,7 @@ $config_commands
 
 Report bugs to the package provider."
 
-ac_cs_config="'--enable-coregrade_api'"
+ac_cs_config=""
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -431,7 +431,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/oameye/coregrade/coregrade/src'
+ac_pwd='/home/tokslaw/coregrade/coregrade/src'
 srcdir='.'
 AWK='gawk'
 test -n "$AWK" || AWK=awk
@@ -503,7 +503,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--enable-coregrade_api' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -547,13 +547,13 @@ host_os='linux-gnu'
 build_alias=''
 build='x86_64-unknown-linux-gnu'
 build_os='linux-gnu'
-SED='/usr/bin/sed'
-Xsed='/usr/bin/sed -e 1s/^X//'
-GREP='/usr/bin/grep'
-EGREP='/usr/bin/grep -E'
-FGREP='/usr/bin/grep -F'
-LD='/usr/bin/ld -m elf_x86_64'
-NM='/usr/bin/nm -B'
+SED='/bin/sed'
+Xsed='/bin/sed -e 1s/^X//'
+GREP='/bin/grep'
+EGREP='/bin/grep -E'
+FGREP='/bin/grep -F'
+LD='/bin/ld -m elf_x86_64'
+NM='/bin/nm -B'
 LN_S='ln -s'
 max_cmd_len='1572864'
 ac_objext='o'
@@ -671,7 +671,7 @@ postdep_objects=''
 predeps=''
 postdeps=''
 compiler_lib_search_path=''
-LD_CXX='/usr/bin/ld -m elf_x86_64'
+LD_CXX='/bin/ld -m elf_x86_64'
 reload_flag_CXX=' -r'
 reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs'
 old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'