Merge branch 'master' into mindcoding

Conflicts:
	run

diff --cc run
index ac7be6c4c207f9f6e3bba399e4d7b21b63bc33b8,fc3bcd04b786316d39f1bf46b7b463be966b2d71..d5ab8d777e923d2b2ebfbd352f874c38e9007c9d
--- 1/run
--- 2/run
+++ b/run
@@@ -1,5 -1,5 +1,5 @@@
  #!/bin/bash
 -export PURGE_HOST=gm.ieval.ro
 +export PURGE_HOST=mindcoding.ro
  export AAP_ROOTDIR=/var/www/auth/us/
  export PLACK_ENV=deployment
- exec start_server --port=8082 -- plackup -s Starlet -Ilib --keepalive-timeout=100000 --max-reqs-per-child=1000 --max-workers=50
 -exec start_server --port=8081 -- plackup -s Starlet -Ilib -L Delayed
++exec start_server --port=8082 -- plackup -s Starlet -Ilib -L Delayed --keepalive-timeout=100000 --max-reqs-per-child=1000 --max-workers=50