quran
diff --git a/‎.babelrc
-1 b/‎.babelrc
-1
diff --git a/‎.gitignore
+1-2 b/‎.gitignore
+1-2
diff --git a/‎CONTRIBUTING.md
-4 b/‎CONTRIBUTING.md
-4
diff --git a/‎README.md
+1-1 b/‎README.md
+1-1
diff --git a/‎bin/server.js
+1-1 b/‎bin/server.js
+1-1
diff --git a/‎bin/server.prod.js
+1-1 b/‎bin/server.prod.js
+1-1
diff --git a/‎package.json
+24-19 b/‎package.json
+24-19
@@ -2,7 +2,6 @@
   "presets": ["react", "es2015", "stage-0"],
   "plugins": [
     "transform-runtime",
-    "add-module-exports",
     "transform-decorators-legacy",
     "transform-react-display-name",
     ["system-import-transformer", {"modules": "common"}]
 
@@ -11,8 +11,7 @@ webpack-stats.json
 webpack-assets.json
 bundle-stats.json
 selenium-debug.log
-tests/functional/output/*
-test/functional/screenshots/*
 .ssh
 webpack-stats.debug.json
 *.DS_Store
+.vscode
@@ -55,10 +55,6 @@ Pull requests are the greatest contributions, so be sure they are focused in sco
 	```
 	Our `npm run test` tests and _watch_. Otherwise use `npm run test:ci:unit` for CI level tests.
 
-	We also have nightwatch function tests. You can install nightwatch globally and can run tests like this:
-	```
-	nightwatch --test tests/functional/specs/Index_spec.js
-	```
 
 5. To create a PR you need to push your branch to the origin(forked) remote and then press some buttons on GitHub:
 
 
@@ -1,4 +1,4 @@
-# Quran.com
+# Quran.com [![SLACK](http://i.imgur.com/Lk5HsBo.png)](https://quranslack.herokuapp.com)
 
 This project is the frontend for Quran.com. It is built using
 [Reactjs] + [Redux] + [Expressjs] + [Webpack]. It is isomorphic (javascript shared
 
@@ -34,5 +34,5 @@ if (__DEVELOPMENT__) {
 global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('../webpack/isomorphic-tools-configuration'))
 .development(process.env.NODE_ENV === 'development')
 .server(rootDir, function() {
-  require('../src/server.js')();
+  require('../src/server.js').default();
 });
@@ -13,5 +13,5 @@ global.__DEVELOPMENT__ = process.env.NODE_ENV !== 'production';
 global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('../webpack/isomorphic-tools-configuration'))
 .development(__DEVELOPMENT__)
 .server(rootDir, function() {
-  require('../dist/server.js')();
+  require('../dist/server.js').default();
 });
@@ -7,15 +7,12 @@
     "test": "npm run test:dev:unit",
     "test:ci:unit": "karma start --browsers PhantomJS --single-run",
     "pretest:ci:unit": "npm run test:ci:lint",
-    "test:ci:functional": "BROWSER=phantomjs ./tests/functional/test.sh start-ci",
-    "posttest:ci:functional": "./tests/functional/test.sh stop",
     "test:dev:unit": "karma start",
     "test:ci:lint": "./node_modules/eslint/bin/eslint.js ./src",
-    "test:dev:functional": "BROWSER=chrome ./tests/functional/test.sh start",
-    "posttest:dev:functional": "./tests/functional/test.sh stop",
     "test:dev:lint": "./node_modules/eslint/bin/eslint.js ./src",
     "test:stylelint": "stylelint './src/**/*.scss' --config ./webpack/.stylelintrc",
-    "dev": "env NODE_PATH='./src' PORT=8000 UV_THREADPOOL_SIZE=100 node ./webpack/webpack-dev-server.js & env NODE_PATH='./src' PORT=8000 node ./bin/server.js",
+    "dev-old": "env NODE_PATH='./src' PORT=8000 UV_THREADPOOL_SIZE=100 node ./webpack/webpack-dev-server.js & env NODE_PATH='./src' PORT=8000 node ./bin/server.js",
+    "dev": "env NODE_PATH='./src' PORT=8000 UV_THREADPOOL_SIZE=100 node ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config ./webpack/dev.config.js & env NODE_PATH='./src' PORT=8000 node ./bin/server.js",
     "start": "NODE_PATH='src' node ./start",
     "build": "npm run build:client & npm run build:server",
     "build:server": "babel ./src -d ./dist -D",
@@ -29,12 +26,14 @@
   },
   "dependencies": {
     "app-module-path": "1.0.2",
+    "autoprefixer": "6.6.1",
     "autoprefixer-loader": "3.2.0",
     "babel-cli": "6.11.4",
-    "babel-core": "6.13.2",
-    "babel-loader": "6.2.4",
+    "babel-core": "^6.24.0",
+    "babel-loader": "^6.4.1",
     "babel-plugin-add-module-exports": "0.1.4",
-    "babel-plugin-system-import-transformer": "2.2.1",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-system-import-transformer": "^3.1.0",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
     "babel-plugin-transform-react-constant-elements": "6.9.1",
     "babel-plugin-transform-react-display-name": "6.8.0",
@@ -43,46 +42,52 @@
     "babel-plugin-transform-runtime": "6.12.0",
     "babel-plugin-typecheck": "3.9.0",
     "babel-polyfill": "6.13.0",
-    "babel-preset-es2015": "6.13.2",
+    "babel-preset-es2015": "^6.24.0",
     "babel-preset-react": "6.11.1",
     "babel-preset-stage-0": "6.5.0",
+    "babel-preset-stage-2": "6.13.0",
     "babel-register": "6.11.6",
     "babel-runtime": "6.11.6",
     "body-parser": "1.15.2",
-    "bootstrap-loader": "1.1.0",
+    "bootstrap-loader": "2.0.0-beta.19",
     "bootstrap-sass": "3.3.7",
-    "bootstrap-sass-loader": "1.0.10",
     "bundle-loader": "0.5.4",
     "cache-manager": "1.5.0",
+    "caniuse-db": "1.0.30000613",
     "clean-webpack-plugin": "0.1.10",
     "compression": "1.6.2",
     "compression-webpack-plugin": "0.3.2",
     "cookie-parser": "1.4.3",
     "copy-to-clipboard": "3.0.5",
     "cors": "2.7.1",
-    "css-loader": "0.23.1",
+    "css-loader": "0.26.1",
+    "cssnano": "3.10.0",
     "debug": "2.2.0",
     "dotenv": "2.0.0",
     "errorhandler": "1.4.3",
     "express": "4.14.0",
     "express-state": "1.4.0",
     "express-useragent": "1.0.4",
-    "extract-text-webpack-plugin": "2.0.0-beta.3",
+    "extract-text-webpack-plugin": "2.0.0-beta.5",
     "file-loader": "0.8.5",
     "fontfaceobserver": "1.7.3",
     "history": "^3.0.0",
     "html-webpack-plugin": "1.7.0",
     "http-proxy": "1.14.0",
     "humps": "2.0.0",
+    "image-webpack-loader": "3.1.0",
     "imports-loader": "0.6.5",
     "json-loader": "0.5.4",
     "morgan": "1.7.0",
     "node-sass": "4.1.1",
     "normalizr": "3.0.2",
+    "postcss-loader": "0.9.1",
+    "precss": "1.4.0",
     "pretty-error": "2.0.0",
     "promise": "7.1.1",
     "proxy-middleware": "0.14.0",
     "qs": "6.2.1",
+    "quran-components": "^0.0.66",
     "raven": "1.1.1",
     "raw-loader": "0.5.1",
     "react": "15.4.1",
@@ -92,8 +97,10 @@
     "react-cookie": "1.0.4",
     "react-dom": "15.4.1",
     "react-helmet": "3.1.0",
+    "react-hot-loader": "3.0.0-beta.6",
     "react-inlinesvg": "0.5.4",
     "react-intl": "2.1.5",
+    "react-loadable": "^3.0.1",
     "react-metrics": "1.2.1",
     "react-paginate": "4.1.0",
     "react-redux": "5.0.1",
@@ -108,6 +115,7 @@
     "redux-connect": "5.0.0",
     "reselect": "2.5.3",
     "resolve-url": "0.2.1",
+    "resolve-url-loader": "1.6.1",
     "sass-loader": "4.1.1",
     "serialize-javascript": "1.3.0",
     "serve-favicon": "2.3.0",
@@ -117,7 +125,8 @@
     "superagent": "3.3.1",
     "url": "0.11.0",
     "url-loader": "0.5.7",
-    "webpack": "2.1.0-beta.20",
+    "webpack": "2.2.0",
+    "webpack-dev-server": "2.1.0-beta.0",
     "webpack-isomorphic-tools": "2.5.7",
     "winston": "1.1.2"
   },
@@ -163,16 +172,12 @@
     "redux-devtools": "3.1.1",
     "redux-devtools-dock-monitor": "1.1.0",
     "redux-devtools-log-monitor": "1.0.5",
-    "selenium-server": "2.48.2",
     "sinon": "1.15.3",
     "sinon-chai": "2.8.0",
     "stylelint": "7.1.0",
     "stylelint-webpack-plugin": "0.2.0",
-    "wdio-mocha-framework": "0.3.7",
-    "wdio-spec-reporter": "0.0.3",
-    "webdriverio": "4.2.1",
     "webpack-bundle-analyzer": "2.2.1",
-    "webpack-dev-server": "1.6.5",
+    "webpack-dev-server": "2.1.0-beta.0",
     "webpack-hot-middleware": "2.12.2"
   },
   "pre-commit": [
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Quran.com`
	`1`	`+# Quran.com [![SLACK](http://i.imgur.com/Lk5HsBo.png)](https://quranslack.herokuapp.com)`
`2`	`2`
`3`	`3`	`This project is the frontend for Quran.com. It is built using`
`4`	`4`	`[Reactjs] + [Redux] + [Expressjs] + [Webpack]. It is isomorphic (javascript shared`