Merged core back into main project

2017-04-02 19:56:47 -04:00
parent 67bd4acdeb
commit 1ced194cd2
34 changed files with 9452 additions and 44 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,7 +26,6 @@
    "winston": true,
    "ws": true,
    "Mongoose": true,
-    "CORE_PATH": true,
    "ROOTPATH": true,
    "IS_DEBUG": true,
    "PROCNAME": true