frozen deps

.travis.yml

@@ -4,7 +4,6 @@ otp_release:
 notifications:
   email: 
     - maxim@synrc.com
-    - roman.dayneko@gmail.com
     - sustel@kakaranet.com
 install: "make"
-script: "make ct"
+script: "make ct"

apps/db/rebar.config

@@ -1,5 +1,5 @@
 {lib_dirs, ["../../apps"]}.
 {deps_dir, ["../../deps"]}.
 {deps, [
-    {kvs,     ".*", {git, "git://github.com/synrc/kvs_core", "HEAD"}}
+    {kvs, ".*", {git, "git://github.com/synrc/kvs", {tag,"1.5.0"}}}
 ]}.

apps/web/priv/static/doc/Kakaranet-Scene.sketch/metadata

@@ -15,7 +15,7 @@
 		<string>LucidaGrande-Bold</string>
 	</array>
 	<key>length</key>
-	<integer>2561510</integer>
+	<integer>2562104</integer>
 	<key>version</key>
 	<integer>36</integer>
 </dict>

apps/web/priv/static/doc/Kakaranet-Scene.svg

@@ -7,7 +7,7 @@
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="Kakaranet-12-maxim" sketch:type="MSLayerGroup">
             <rect id="Sky" fill="#EDF9FF" sketch:type="MSShapeGroup" x="0" y="0" width="1070.148" height="453"></rect>
-            <ellipse id="Sun" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="255.029" cy="109.081" rx="68.029" ry="68.081"></ellipse>
+            <path d="M255.029,177.162 C292.600379,177.162 323.058,146.681098 323.058,109.081 C323.058,71.4809019 292.600379,41 255.029,41 C217.457621,41 187,71.4809019 187,109.081 C187,146.681098 217.457621,177.162 255.029,177.162 Z" id="Sun" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M973.021,106.358 L973.021,148.932 L949.433,148.932 L949.433,86.595 L882.922,86.714 L882.922,160.891 L862.149,160.891 L862.149,156.176 L853.66,156.176 L853.66,142.97 L843.284,142.97 L843.284,167.495 L840.454,167.495 C829.065,150.1 829.136,145.8 829.136,145.8 L829.136,141.084 L826.305,141.084 C822.356,126.876 821.589,118.445 821.589,118.445 L822.531,118.445 L822.531,114.672 L820.644,114.672 C815.581,67.28 814.985,40.153 814.985,40.153 L815.928,40.153 L815.928,37.323 L814.985,37.323 L814.985,35.437 L815.928,35.437 L815.928,33.55 L814.04,30.719 L813.1,30.719 L813.1,17.515 L811.214,17.515 L811.214,30.72 L810.271,30.72 L808.384,33.551 L808.384,35.438 L809.326,35.438 L809.326,37.323 L808.384,37.323 L808.384,40.153 L809.326,40.153 C809.326,79.498 804.608,114.672 804.608,114.672 L802.722,114.672 L802.722,118.445 L803.665,118.445 C803.114,129.843 798.947,141.084 798.947,141.084 L796.118,141.084 L796.118,145.8 C795.566,151.296 787.146,165.565 785.756,167.516 C785.068,167.516 784.587,167.495 783.856,167.495 L783.856,145.8 L775.289,145.8 C775.289,145.8 775.277,154.513 775.289,156.182 C774.904,156.182 773.533,156.18 771.654,156.18 C771.654,145.685 771.594,129.764 771.594,129.764 L757.445,129.764 L757.445,156.176 L745.183,156.176 L745.183,144.857 L737.636,144.857 L737.636,115.615 L712.17,115.615 L712.17,125.991 L697.076,125.991 L697.076,87.318 L636.707,87.318 L636.707,128.821 L620.673,128.821 L620.673,157.119 L596.148,157.119 C595.835,148.148 590.489,147.687 590.489,147.687 L590.489,142.971 L588.601,142.971 L588.601,147.687 C582.824,149.632 583.885,157.119 583.885,157.119 L574.451,157.119 C572.507,148.395 566.904,147.687 566.904,147.687 L566.904,143.914 L565.018,143.914 L565.018,147.687 C563.368,148.571 563.131,149.573 563.131,149.573 L563.131,141.084 L565.018,141.084 L565.018,138.254 L563.131,138.254 L563.131,112.786 L565.018,112.786 L565.018,110.899 L565.961,110.899 L565.961,107.125 L562.188,107.125 L562.188,91.09 L563.131,91.09 L563.131,88.259 L564.073,88.259 L564.073,85.429 L561.243,85.429 L561.243,78.826 L562.186,78.826 L562.186,74.109 L559.356,74.109 L559.356,68.449 C560.948,67.271 559.356,65.62 559.356,65.62 L559.356,58.073 L557.47,58.073 L557.47,65.62 C555.642,67.035 557.47,68.449 557.47,68.449 L557.47,74.109 L554.64,74.109 L554.64,78.826 L555.583,78.826 L555.583,85.429 L552.753,85.429 L552.753,88.259 L553.695,88.259 L553.695,91.09 L554.638,91.09 L554.638,107.125 L550.866,107.125 L550.866,110.899 L551.808,110.899 L551.808,112.786 L553.695,112.786 L553.695,138.254 L551.808,138.254 L551.808,141.084 L553.695,141.084 L553.695,149.573 L548.035,149.573 C547.446,147.805 544.264,147.687 544.264,147.687 L544.264,144.857 L542.377,144.857 L542.377,147.687 C538.84,147.864 537.659,149.573 537.659,149.573 L537.659,135.423 L539.547,135.423 L539.547,131.65 L537.659,131.65 L537.659,103.352 L539.547,103.352 L539.547,98.636 L541.434,98.636 L541.434,94.863 L536.718,94.863 L536.718,75.054 L538.604,75.054 L538.604,68.45 L535.775,68.45 L535.775,61.847 L536.718,61.847 L536.718,55.244 L533.888,55.244 L533.888,48.64 C534.654,48.346 534.95,47.166 534.83,45.811 C534.713,44.455 533.888,43.924 533.888,43.924 L533.888,36.378 L532.002,36.378 L532.002,43.924 C531.411,44.218 531.169,45.04 531.059,45.811 C530.823,48.346 532.002,48.64 532.002,48.64 L532.002,55.244 L529.172,55.244 L529.172,61.847 L530.114,61.847 L530.114,68.45 L527.284,68.45 L527.284,75.054 L529.171,75.054 L529.171,94.863 L524.453,94.863 L524.453,98.636 L526.34,98.636 L526.34,103.352 L528.228,103.352 L528.228,126.934 L527.285,126.934 L527.285,122.218 L525.397,122.218 L525.397,126.934 C515.14,128.585 515.965,140.14 515.965,140.14 L515.965,145.799 L514.078,145.799 L514.078,137.309 L512.191,137.309 C512.603,131.827 511.189,130.707 509.361,130.707 C506.236,130.883 506.531,135.422 506.531,135.422 L504.643,135.422 C504.525,128.879 501.873,128.819 500.871,128.819 C500.871,114.848 497.039,110.898 495.212,110.898 C492.616,91.03 478.233,89.203 478.233,89.203 L478.233,87.317 L476.346,87.317 L476.346,75.997 L473.516,75.997 L473.516,87.317 L471.63,87.317 L471.63,89.203 C465.91,90.795 463.14,94.863 463.14,94.863 L463.14,88.259 L461.254,88.259 L461.254,96.749 L459.366,96.749 L459.366,98.636 C441.68,102.468 445.218,125.047 445.218,125.047 L447.106,125.047 L447.106,131.65 C443.215,127.818 439.736,131.12 438.617,134.481 C437.969,132.122 434.844,131.65 434.844,131.65 L434.844,127.877 L432.958,127.877 L432.958,131.65 C424.625,131.965 425.32,139.196 425.32,139.196 L425.32,146.176 L410.013,146.176 L410.013,139.244 L395.325,139.244 L395.325,146.176 L381.275,146.176 L381.275,116.908 L373.936,116.908 L373.936,106.94 L363.451,106.94 L363.451,95.922 L358.209,95.922 L340.903,67.591 L322.026,96.446 L316.259,96.446 L316.259,106.94 L306.298,106.94 L306.298,116.908 L299.484,116.908 L299.484,139.433 L290.457,139.433 L290.457,129.912 L275.25,129.912 L275.25,150.898 L254.477,150.898 L254.477,163.561 L245.876,163.561 L245.876,126.663 L222.285,126.663 L222.285,118.269 L217.042,118.269 L217.042,109.874 L210.75,109.874 L210.75,100.431 L207.08,100.431 L207.08,81.543 L202.887,81.543 L202.887,100.431 L199.218,100.431 L199.218,109.874 L193.45,109.874 L193.45,118.794 L188.207,118.794 L188.207,126.663 L165.14,126.663 L165.072,143.913 C159.36,141.713 154.38,140.088 149.038,138.253 L149.038,38.266 L142.434,38.266 L142.434,53.359 L125.455,53.359 L125.455,38.267 L118.851,38.267 L118.851,128.821 C81.324,120.66 55.486,121.175 37.761,125.265 L37.761,85.431 L33.013,85.431 L33.013,92.977 L23.58,92.977 L23.58,85.431 L18.87,85.431 L18.87,132.251 C3.001,141.002 0,152.403 0,152.403 L0,459.423 L1070,459.423 L1070,106.358 L973.021,106.358 L973.021,106.358 Z M18.866,156.176 L3.773,156.176 C3.773,156.176 7.054,147.077 18.867,140.14 L18.867,156.176 L18.866,156.176 L18.866,156.176 Z M33.014,143.913 L31.127,143.913 L31.127,156.176 L23.581,156.176 L23.581,138.254 C28.238,135.571 33.014,134.482 33.014,134.482 L33.014,143.913 L33.014,143.913 Z M33.014,125.991 C33.014,125.991 26.883,127.641 23.581,129.764 L23.581,112.727 C24.378,112.727 32.219,112.786 33.014,112.786 L33.014,125.991 L33.014,125.991 Z M33.014,108.069 L23.581,108.069 L23.581,97.694 C24.583,97.694 30.803,97.635 33.014,97.635 L33.014,108.069 L33.014,108.069 Z M118.853,156.176 L108.477,156.176 L108.477,149.572 L95.271,149.572 L95.271,156.176 L91.499,156.176 L91.499,142.97 L82.978,142.97 L82.978,156.176 L77.348,156.176 L77.348,151.459 L61.254,151.459 L61.254,156.176 L44.334,156.176 C44.334,154.669 44.341,149.126 44.334,143.913 C44.334,143.88 37.73,143.946 37.73,143.913 C37.723,138.761 37.702,133.858 37.702,133.505 C55.073,130.613 80.877,133.044 118.852,148.629 C118.853,149.902 118.853,153.582 118.853,156.176 L118.853,156.176 L118.853,156.176 Z M125.455,156.176 L125.455,150.516 C130.09,152.307 133.657,154.069 138.661,156.176 L125.455,156.176 L125.455,156.176 Z M142.434,135.423 L125.455,130.708 L125.455,92.033 L142.434,92.033 L142.434,135.423 L142.434,135.423 Z M142.434,83.544 L125.455,83.544 L125.455,61.848 L142.434,61.848 L142.434,83.544 L142.434,83.544 Z M809.326,124.104 L815.93,124.104 C816.107,127.346 818.76,141.083 818.76,141.083 L806.495,141.083 C807.886,136.713 809.326,124.104 809.326,124.104 L809.326,124.104 L809.326,124.104 Z M796.12,167.495 C796.12,165.284 799.757,153.346 813.099,153.346 C819.135,153.346 829.267,156.666 830.078,167.495 L796.12,167.495 L796.12,167.495 Z M288.153,69.208 L289.123,69.208 C289.366,70.842 289.903,74.626 290.276,78.475 L289.837,78.475 L289.837,84.373 L290.681,85.216 L298.263,85.216 L299.106,84.373 L299.106,78.475 L298.634,78.475 C299.016,74.626 299.568,70.842 299.817,69.208 L300.791,69.208 C300.791,69.208 302.546,63.66 310.059,55.728 C317.571,47.793 319.326,43.56 319.326,37.192 C319.326,32.277 312.652,16.971 294.892,16.971 C286.467,16.971 269.617,21.465 269.617,38.034 C269.617,42.807 271.583,48.215 278.885,55.727 C286.187,63.239 287.876,68.817 288.153,69.208 L288.153,69.208 L288.153,69.208 Z M291.5,69.062 L297.25,69.062 L297.25,69.208 L298.954,69.208 C298.365,72.524 297.991,75.856 297.762,78.475 L297.25,78.475 L296.416,78.475 L295.61,78.475 L293.201,78.475 L292.416,78.475 L291.5,78.475 L291.126,78.475 C290.902,75.857 290.538,72.525 289.963,69.208 L291.5,69.208 L291.5,69.062 L291.5,69.062 Z" id="City" fill="#DFF1F4" sketch:type="MSShapeGroup"></path>
             <g id="Detailed-Houses" transform="translate(21.000000, 105.000000)" sketch:type="MSShapeGroup">
                 <g id="Group" transform="translate(117.000000, 268.000000)" fill="#F4EDE2">
@@ -160,26 +160,6 @@
                 <path d="M105.162,84.884 C104.107,95.366 89.771,103.669 72.233,103.669 C54.349,103.669 39.803,95.034 39.263,84.261 C22.845,88.689 13.482,103.282 4.506,117.677 L139.96,117.677 C126.742,99.013 118.281,88.847 105.162,84.884 L105.162,84.884 L105.162,84.884 Z" id="Alina-Body_2_" fill="#F5948B"></path>
                 <path d="M44.145,83.259 C45.973,83.027 47.877,82.898 49.876,82.898 L58.173,82.898 L59.367,70.968 C55.627,66.616 52.951,61.962 52.973,58.825 L51.973,52.239 C51.941,52.239 51.91,52.247 51.874,52.247 C50.201,52.247 48.844,50.893 48.844,49.22 L48.844,40.624 C48.844,38.95 50.201,38.835 51.874,38.835 C51.877,38.835 51.879,38.837 51.882,38.837 C51.885,38.839 51.887,38.843 51.89,38.845 C53.223,40.273 53.233,38.413 58.635,37.622 C67.945,36.259 75.322,31.417 80.542,26.647 C82.038,31.254 85.015,37.137 90.841,40.329 C91.099,39.942 91.29,39.433 91.429,38.841 C91.447,38.839 91.462,38.835 91.48,38.835 L92.789,38.835 C93.248,38.835 93.652,39.015 93.963,39.302 C94.215,39.493 94.387,39.773 94.465,40.159 C94.492,40.284 94.516,40.419 94.516,40.555 C94.516,40.569 94.51,40.578 94.51,40.592 C94.51,40.604 94.516,40.608 94.516,40.623 L94.516,49.219 C94.516,50.893 93.155,52.246 91.481,52.246 C91.364,52.246 91.252,52.223 91.139,52.213 L90.139,58.824 C89.66,62.377 87.555,66.095 84.676,69.595 C84.699,69.566 84.725,69.538 84.748,69.509 C85.152,76.8 85.869,81.191 86.195,82.896 L89.752,82.896 C92.418,82.896 94.891,83.023 97.219,83.271 C126.096,38.632 99.414,14.898 89.518,15.636 C84.409,9.511 79.217,6.476 74.327,5.593 C74.175,5.564 74.024,5.536 73.872,5.511 C73.647,5.476 73.423,5.445 73.198,5.419 C72.85,5.378 72.506,5.347 72.16,5.327 C72.094,5.323 72.025,5.315 71.959,5.313 C69.424,5.194 66.992,5.645 64.719,6.528 C51.712,4.536 32.207,19.202 39.554,57.37 C42.302,71.313 45.459,77.747 44.145,83.259 L44.145,83.259 L44.145,83.259 Z" id="Alina-Hair_2_" fill="#E58D25"></path>
             </g>
-            <g id="Gabrielo-Persona-Central" transform="translate(466.000000, 151.000000)" sketch:type="MSShapeGroup">
-                <path d="M144.949,117.675 C144.949,116.659 144.652,115.646 144.041,114.786 C135.115,102.182 128.525,93.745 121.254,87.915 C114.32,82.358 106.887,79.321 97.547,78.302 C96.945,76.116 96.068,74.478 94.879,73.3 C94.297,72.57 93.566,71.976 92.725,71.558 C92.416,71.404 92.106,71.249 91.793,71.099 C93.441,67.814 94.273,64.132 94.273,60.099 L94.273,57.031 C96.316,55.576 97.65,53.187 97.65,50.494 L97.65,41.898 L97.65,41.865 L97.65,41.83 C97.65,41.359 97.597,40.887 97.488,40.389 C97.425,40.094 97.345,39.807 97.25,39.53 C97.299,39.231 97.35,38.93 97.398,38.634 C98.916,29.562 100.224,21.728 98.097,16.046 C97.499,14.446 96.765,13.052 95.902,11.868 C95.906,11.827 95.908,11.784 95.91,11.743 C95.984,10.157 95.301,8.628 94.068,7.626 C93.523,7.185 92.078,6.196 89.922,6.071 C87.41,3.559 83.014,0.405 76.793,0.403 C73.455,0.403 70.05,1.341 66.658,3.188 C66.049,1.725 64.769,0.618 63.191,0.245 C62.808,0.155 62.423,0.11 62.042,0.11 C60.549,0.11 59.109,0.78 58.146,1.975 C58.14,1.983 58.134,1.991 58.126,2 C57.359,1.543 56.478,1.297 55.57,1.297 C55.397,1.297 55.223,1.305 55.049,1.322 C53.873,1.445 52.797,1.978 51.992,2.804 C51.25,2.042 50.264,1.519 49.156,1.353 C48.907,1.316 48.658,1.296 48.412,1.296 C46.443,1.296 44.625,2.462 43.825,4.314 C43.382,5.339 39.635,14.453 42.615,22.695 C42.656,28.468 42.884,33.529 43.295,37.799 C42.447,38.908 41.976,40.313 41.976,41.899 L41.976,50.495 C41.976,53.079 43.204,55.382 45.105,56.85 L45.105,60.1 C45.105,64.082 46.002,67.786 47.78,71.157 C46.747,71.854 46.147,72.364 46.001,72.493 C43.985,73.921 42.735,76.225 42.091,78.544 C20.784,82.122 9.465,100.274 0.263,115.032 C-0.241,115.839 -0.487,116.757 -0.487,117.677 L144.949,117.677 L144.949,117.675 L144.949,117.675 Z" id="Gabrielo-Selection_3_" fill="#557EBE"></path>
-                <path d="M67.614,87.796 L65.793,98.864 C65.723,99.296 65.456,99.669 65.075,99.882 C64.859,100.003 64.619,100.066 64.38,100.066 C64.193,100.066 64.008,100.023 63.829,99.953 C63.223,99.703 48.924,93.676 46.639,83.394 C46.269,81.726 47.043,77.517 49.203,76.38 C49.235,76.339 49.251,76.294 49.295,76.253 C49.42,76.144 50.945,74.857 53.708,73.501 L52.452,78.169 C52.453,78.171 52.454,78.171 52.455,78.173 C54.046,79.866 56.037,81.286 58.02,82.441 L58.012,82.441 C62.289,84.927 66.526,86.168 66.593,86.187 C67.293,86.386 67.731,87.079 67.614,87.796 L67.614,87.796 L67.614,87.796 Z M91.114,76.638 C90.975,76.382 90.766,76.167 90.503,76.036 C88.685,75.122 86.878,74.323 85.087,73.624 L86.509,79.112 C86.509,79.114 86.507,79.114 86.505,79.116 C85.144,80.368 83.579,81.448 82.017,82.366 L82.029,82.366 C77.711,84.901 73.394,86.167 73.324,86.186 C72.63,86.385 72.19,87.079 72.303,87.795 L74.124,98.863 C74.196,99.295 74.458,99.668 74.841,99.881 C75.058,100.002 75.3,100.065 75.544,100.065 C75.728,100.065 75.913,100.022 76.089,99.952 C76.694,99.702 90.989,93.675 93.275,83.393 C93.623,81.833 92.969,78.052 91.114,76.638 L91.114,76.638 L91.114,76.638 Z" id="Gabrielo-Colar_2_" fill="#EFEFEF"></path>
-                <path d="M93.336,82.987 C93.32,83.133 93.301,83.272 93.273,83.393 C90.988,93.674 76.693,99.702 76.087,99.952 C75.911,100.022 75.726,100.065 75.542,100.065 C75.298,100.065 75.056,100.002 74.839,99.881 C74.456,99.668 74.194,99.295 74.122,98.863 L72.664,90 C72.609,90.039 72.568,90.066 72.56,90.068 C72.394,90.125 67.648,90.097 67.234,90.093 L65.791,98.863 C65.721,99.295 65.454,99.668 65.073,99.881 C64.857,100.002 64.617,100.065 64.378,100.065 C64.191,100.065 64.006,100.022 63.827,99.952 C63.221,99.702 48.922,93.675 46.637,83.393 C46.613,83.284 46.593,83.163 46.579,83.032 C25.47,84.608 14.735,101.27 4.506,117.675 L139.96,117.675 C123.178,93.976 114.059,83.981 93.336,82.987 L93.336,82.987 L93.336,82.987 Z" id="Gabrielo-Body_5_" fill="#EEC173"></path>
-                <path d="M93.416,17.796 C92.451,15.218 91.23,13.858 90.184,13.142 C89.938,12.824 89.799,12.249 90.916,11.505 C90.916,11.505 89.707,10.525 87.977,11.46 C86.819,9.839 79.836,1.105 68.23,8.046 C66.042,9.359 62.667,7.983 62.042,5.108 C61.066,6.321 60.438,7.879 60.346,9.532 C58.188,8.469 56.463,7.372 55.572,6.296 C55.572,6.296 54.002,9.28 54.499,12.468 C51.132,11.105 48.733,9.138 48.418,6.296 C48.418,6.296 44.834,14.589 47.418,21.255 C47.474,21.4 47.547,21.526 47.612,21.661 C47.639,30.276 48.077,36.182 48.597,40.19 C49.012,40.127 49.479,40.11 49.98,40.11 L50.056,44.465 C50.056,44.465 52.45,44.93 52.823,41.471 C53.442,36.537 51.539,23.094 59.142,25.354 C66.747,27.62 71.365,28.805 76.504,26.137 C81.639,23.463 84.463,27.926 85.543,30.91 C86.584,33.787 84.805,43.578 89.328,43.164 C89.353,42.082 89.308,41.223 89.346,40.135 C89.436,40.123 89.522,40.108 89.616,40.108 L90.925,40.108 C91.347,40.108 91.72,40.266 92.019,40.514 C93.555,31.138 95.25,22.7 93.416,17.796 L93.416,17.796 L93.416,17.796 Z" id="Gabrielo-Hair_3_" fill="#5C3B2B"></path>
-                <path d="M92.598,41.433 C92.522,41.046 92.35,40.767 92.098,40.576 C92.073,40.555 92.043,40.535 92.016,40.513 C91.944,40.452 91.864,40.398 91.782,40.347 C91.78,40.347 91.776,40.345 91.774,40.343 C91.694,40.296 91.61,40.255 91.524,40.222 C91.499,40.212 91.469,40.206 91.442,40.199 C91.376,40.176 91.309,40.154 91.239,40.14 C91.137,40.12 91.032,40.109 90.925,40.109 L89.616,40.109 C89.522,40.109 89.434,40.125 89.346,40.138 C89.309,41.224 89.354,42.083 89.328,43.165 C84.805,43.579 86.584,33.788 85.543,30.911 C84.463,27.927 81.639,23.464 76.504,26.138 C71.364,28.806 66.747,27.62 59.142,25.355 C51.538,23.095 53.442,36.539 52.823,41.472 C52.45,44.931 50.056,44.466 50.056,44.466 L49.98,40.111 C49.479,40.111 49.012,40.129 48.597,40.191 L48.597,40.191 C47.639,40.334 46.978,40.738 46.978,41.898 L46.978,50.494 C46.978,52.168 48.335,53.521 50.009,53.521 C50.044,53.521 50.073,53.511 50.107,53.511 L50.107,60.099 C50.107,69.923 56.931,76.525 66,80.058 C66.397,81.587 67.77,82.72 69.426,82.72 C70.996,82.72 72.317,81.693 72.783,80.277 C82.989,76.443 89.274,70.211 89.274,60.099 L89.274,53.488 C89.385,53.498 89.497,53.521 89.616,53.521 C91.29,53.521 92.651,52.167 92.651,50.494 L92.651,41.898 C92.651,41.882 92.643,41.878 92.643,41.867 C92.643,41.853 92.651,41.842 92.651,41.83 C92.651,41.692 92.627,41.558 92.598,41.433 L92.598,41.433 L92.598,41.433 Z" id="Gabrielo-Face_1_" fill="#FFE0A5"></path>
-                <path d="M64.663,49.706 C63.998,49.706 63.46,49.167 63.46,48.501 C63.46,47.675 62.786,46.999 61.954,46.999 C61.124,46.999 60.45,47.675 60.45,48.501 C60.45,49.167 59.91,49.706 59.248,49.706 C58.581,49.706 58.044,49.167 58.044,48.501 C58.044,46.347 59.797,44.593 61.954,44.593 C64.114,44.593 65.868,46.347 65.868,48.501 C65.868,49.167 65.329,49.706 64.663,49.706 L64.663,49.706 L64.663,49.706 Z M81.334,48.501 C81.334,46.347 79.58,44.593 77.422,44.593 C75.27,44.593 73.512,46.347 73.512,48.501 C73.512,49.167 74.051,49.706 74.717,49.706 C75.379,49.706 75.922,49.167 75.922,48.501 C75.922,47.675 76.594,46.999 77.422,46.999 C78.254,46.999 78.928,47.675 78.928,48.501 C78.928,49.167 79.465,49.706 80.133,49.706 C80.791,49.706 81.334,49.167 81.334,48.501 L81.334,48.501 L81.334,48.501 Z" id="Gabrielo-Eyes_2_" fill="#3F372E"></path>
-                <path d="M72.782,80.276 C72.315,81.692 70.995,82.719 69.425,82.719 C67.769,82.719 66.397,81.586 65.999,80.057 C61.188,78.184 57.024,75.438 54.16,71.813 L52.451,78.168 C57.469,83.516 66.494,86.156 66.593,86.186 C67.293,86.385 67.731,87.079 67.614,87.795 L67.236,90.094 C67.65,90.098 72.396,90.125 72.562,90.069 C72.57,90.067 72.611,90.04 72.666,90.001 L72.303,87.796 C72.19,87.079 72.629,86.386 73.324,86.187 C73.42,86.16 81.387,83.828 86.51,79.113 L84.819,72.584 C81.971,75.864 77.864,78.368 72.782,80.276 L72.782,80.276 L72.782,80.276 Z" id="Gabrielo-Neck_3_" fill="#FFD192"></path>
-                <path d="M80.979,62.573 C80.168,63.786 75.321,69.464 69.892,69.464 C64.784,69.464 59.85,66.206 58.509,62.566 C57.555,60.416 59.021,60.05 60.319,60.767 C63.298,62.486 71.713,64.88 79.663,60.31 C80.842,59.632 82.123,60.88 80.979,62.573" id="Gabrielo-Smile_3_" fill="#E5BC7B"></path>
-            </g>
-            <g id="Mustafa-Persona-Center" transform="translate(466.000000, 144.000000)" sketch:type="MSShapeGroup">
-                <path d="M144.95,124.675 C144.95,123.66 144.651,122.645 144.042,121.786 C135.116,109.182 128.526,100.744 121.255,94.915 C114.37,89.397 106.993,86.364 97.745,85.323 C97.212,83.493 96.296,81.647 94.852,80.266 C94.276,79.551 93.555,78.969 92.725,78.557 C92.414,78.402 92.102,78.247 91.787,78.096 C93.439,74.809 94.273,71.129 94.273,67.097 L94.273,64.03 C96.316,62.573 97.65,60.184 97.65,57.492 L97.65,53.613 C97.748,53.479 97.841,53.341 97.927,53.196 C104.464,42.221 104.896,30.598 99.14,20.469 C91.765,7.489 76.722,0.483 66.311,0.481 L66.307,0.481 C63.17,0.481 60.387,1.079 58.031,2.257 C57.968,2.289 57.903,2.322 57.841,2.358 C55.503,3.657 54.333,6.172 54.93,8.619 C55.118,9.388 55.468,10.085 55.943,10.681 C50.746,12.138 43.605,16.685 39.527,25.14 C36.697,31.007 34.57,40.63 40.513,53.152 C40.981,54.136 41.471,55.064 41.977,55.925 L41.977,57.492 C41.977,60.075 43.205,62.378 45.106,63.846 L45.106,67.097 C45.106,71.08 46.003,74.784 47.782,78.155 C46.735,78.861 46.132,79.376 46.001,79.491 C43.986,80.919 42.736,83.223 42.092,85.541 C20.785,89.12 9.466,107.272 0.264,122.03 C-0.239,122.837 -0.486,123.758 -0.487,124.675 L144.95,124.675 L144.95,124.675 Z" id="Mustafa-Selection_1_" fill="#557EBE"></path>
-                <path d="M92.652,48.828 C92.652,48.691 92.629,48.557 92.599,48.432 C92.523,48.045 92.351,47.766 92.099,47.575 C91.788,47.288 91.382,47.109 90.925,47.109 L89.616,47.109 C89.522,47.109 89.436,47.125 89.346,47.136 C89.309,48.223 89.354,49.083 89.328,50.165 C84.805,50.578 86.584,40.787 85.543,37.91 C84.463,34.926 81.639,30.464 76.504,33.137 C71.363,35.805 66.746,34.619 59.141,32.355 C51.537,30.095 53.441,43.538 52.822,48.471 C52.449,51.93 50.055,51.466 50.055,51.466 L49.979,47.109 C48.319,47.111 46.977,47.234 46.977,48.897 L46.977,57.493 C46.977,59.167 48.334,60.52 50.008,60.52 C50.043,60.52 50.072,60.511 50.106,60.511 L50.106,67.098 C50.106,76.922 56.93,83.524 65.999,87.058 C66.396,88.586 67.769,89.719 69.425,89.719 C70.995,89.719 72.316,88.692 72.782,87.276 C82.989,83.442 89.274,77.21 89.274,67.098 L89.274,60.487 C89.385,60.497 89.497,60.52 89.616,60.52 C91.29,60.52 92.651,59.166 92.651,57.493 L92.651,48.897 C92.651,48.881 92.643,48.877 92.643,48.867 C92.644,48.853 92.652,48.841 92.652,48.828 L92.652,48.828 L92.652,48.828 Z" id="Mustafa-Face_3_" fill="#FFE0A5"></path>
-                <path d="M64.663,56.705 C63.998,56.705 63.46,56.166 63.46,55.501 C63.46,54.674 62.786,53.998 61.954,53.998 C61.124,53.998 60.45,54.674 60.45,55.501 C60.45,56.166 59.91,56.705 59.248,56.705 C58.581,56.705 58.044,56.166 58.044,55.501 C58.044,53.346 59.797,51.592 61.954,51.592 C64.114,51.592 65.868,53.346 65.868,55.501 C65.868,56.166 65.329,56.705 64.663,56.705 L64.663,56.705 L64.663,56.705 Z M81.335,55.501 C81.335,53.346 79.581,51.592 77.423,51.592 C75.271,51.592 73.513,53.346 73.513,55.501 C73.513,56.166 74.052,56.705 74.718,56.705 C75.38,56.705 75.923,56.166 75.923,55.501 C75.923,54.674 76.595,53.998 77.423,53.998 C78.255,53.998 78.929,54.674 78.929,55.501 C78.929,56.166 79.466,56.705 80.134,56.705 C80.792,56.705 81.335,56.166 81.335,55.501 L81.335,55.501 L81.335,55.501 Z" id="Mustafa-Eyes_2_" fill="#3F372E"></path>
-                <path d="M60.27,6.729 C59.486,7.165 59.753,7.752 60.275,7.767 C61.488,7.797 62.338,8.017 63.045,9.078 C63.263,9.514 64.668,13.637 57.808,15.363 C49.221,17.363 35.337,30.582 45.032,51.007 C45.639,52.283 46.266,53.409 46.913,54.397 C46.935,54.395 46.957,54.394 46.979,54.392 L46.979,48.897 C46.979,47.234 48.321,47.111 49.981,47.109 L50.057,51.466 C50.057,51.466 52.451,51.93 52.824,48.471 C53.443,43.537 51.54,30.095 59.143,32.355 C66.748,34.62 71.366,35.805 76.506,33.137 C81.641,30.464 84.465,34.926 85.545,37.91 C86.586,40.787 84.807,50.578 89.33,50.165 C89.355,49.083 89.31,48.223 89.348,47.136 C89.438,47.124 89.524,47.109 89.618,47.109 L90.927,47.109 C91.384,47.109 91.79,47.288 92.101,47.575 C92.353,47.766 92.525,48.046 92.601,48.432 C92.63,48.558 92.654,48.692 92.654,48.828 C92.654,48.841 92.646,48.852 92.646,48.866 C92.646,48.877 92.654,48.881 92.654,48.896 L92.654,50.719 C92.98,50.692 93.299,50.664 93.636,50.636 C111.089,21.334 73.722,-0.001 60.27,6.729 L60.27,6.729 L60.27,6.729 Z" id="Mustafa-Hair_3_" fill="#3F372E"></path>
-                <path d="M139.962,124.675 L4.506,124.675 C14.736,108.271 25.471,91.609 46.58,90.031 C46.594,90.162 46.613,90.284 46.638,90.393 C48.923,100.674 63.222,106.702 63.828,106.952 C64.007,107.022 64.192,107.065 64.379,107.065 C64.618,107.065 64.858,107.002 65.074,106.881 C65.455,106.668 65.721,106.295 65.792,105.863 L67.235,97.093 C67.649,97.097 72.395,97.124 72.561,97.068 C72.569,97.066 72.61,97.039 72.665,97 L74.124,105.863 C74.196,106.295 74.458,106.668 74.841,106.881 C75.058,107.002 75.3,107.065 75.544,107.065 C75.728,107.065 75.913,107.022 76.089,106.952 C76.694,106.702 90.989,100.675 93.275,90.393 C93.302,90.272 93.322,90.133 93.338,89.987 C114.06,90.98 123.179,100.976 139.962,124.675 L139.962,124.675 L139.962,124.675 Z" id="Mustafa-Body_3_" fill="#8CCDD6"></path>
-                <path d="M72.782,87.276 C72.315,88.692 70.995,89.719 69.425,89.719 C67.769,89.719 66.397,88.586 65.999,87.057 C61.188,85.184 57.024,82.437 54.16,78.813 L52.451,85.168 C57.469,90.516 66.494,93.155 66.593,93.186 C67.293,93.385 67.731,94.079 67.614,94.795 L67.236,97.094 C67.65,97.098 72.396,97.125 72.562,97.069 C72.57,97.067 72.611,97.04 72.666,97.001 L72.303,94.796 C72.19,94.079 72.629,93.386 73.324,93.187 C73.42,93.159 81.387,90.828 86.51,86.113 L84.819,79.584 C81.972,82.863 77.865,85.368 72.782,87.276 L72.782,87.276 L72.782,87.276 Z" id="Mustafa-Neck_3_" fill="#FFD192"></path>
-                <path d="M67.614,94.796 L65.793,105.864 C65.723,106.296 65.456,106.669 65.075,106.882 C64.859,107.003 64.619,107.066 64.38,107.066 C64.193,107.066 64.008,107.023 63.829,106.953 C63.223,106.703 48.924,100.676 46.639,90.394 C46.269,88.725 47.043,84.516 49.203,83.38 C49.235,83.338 49.251,83.293 49.295,83.253 C49.42,83.144 50.945,81.857 53.708,80.501 L52.452,85.169 C52.453,85.171 52.454,85.171 52.455,85.173 C54.046,86.866 56.037,88.286 58.02,89.44 L58.012,89.44 C62.289,91.927 66.526,93.167 66.593,93.187 C67.293,93.386 67.731,94.079 67.614,94.796 L67.614,94.796 L67.614,94.796 Z M91.115,83.638 C90.976,83.382 90.767,83.167 90.504,83.036 C88.686,82.122 86.879,81.323 85.088,80.624 L86.51,86.112 C86.51,86.113 86.508,86.114 86.506,86.116 C85.145,87.368 83.58,88.448 82.018,89.366 L82.03,89.366 C77.712,91.901 73.395,93.166 73.325,93.186 C72.63,93.385 72.19,94.079 72.304,94.795 L74.126,105.863 C74.198,106.295 74.46,106.668 74.843,106.881 C75.06,107.002 75.302,107.065 75.546,107.065 C75.73,107.065 75.915,107.022 76.091,106.952 C76.696,106.702 90.991,100.675 93.277,90.393 C93.624,88.833 92.97,85.052 91.115,83.638 L91.115,83.638 L91.115,83.638 Z" id="Mustafa-Colar_2_" fill="#EFEFEF"></path>
-                <path d="M80.98,69.747 C80.169,70.962 75.322,76.639 69.892,76.639 C64.784,76.639 59.85,73.382 58.509,69.74 C57.555,67.592 59.021,67.225 60.319,67.943 C63.298,69.662 71.713,72.056 79.664,67.486 C80.843,66.808 82.124,68.056 80.98,69.747" id="Mustafa-Smile_2_" fill="#E5BC7B"></path>
-            </g>
             <g id="Table" transform="translate(218.000000, 310.000000)" sketch:type="MSShapeGroup">
                 <path d="M634.171,146.66 L-0.36,146.66 L115.967,0.23 L524.45,0.23 L634.171,146.66 L634.171,146.66 Z" id="Shape" fill="#48AF5E"></path>
                 <path d="M475.849,63.473 C484.752,87.426 414.057,108.909 317,108.909 C219.942,108.909 149.248,87.428 158.15,63.473 C166.156,41.932 236.962,26 317,26 C397.037,26 467.843,41.932 475.849,63.473 L475.849,63.473 L475.849,63.473 Z" id="Table-Oval" fill="#5CBF6F"></path>
@@ -276,7 +256,7 @@
                 <text id="4" sketch:type="MSTextLayer" font-family="Lucida Grande" font-size="24" font-weight="bold" sketch:alignment="middle" letter-spacing="-1" fill="#F8E81C">
                     <tspan x="26.3339844" y="26.4873125">4</tspan>
                 </text>
-                <path d="M33.5,50 C37.0898509,50 40,47.0898509 40,43.5 C40,39.9101491 37.0898509,37 33.5,37 C29.9101491,37 27,39.9101491 27,43.5 C27,47.0898509 29.9101491,50 33.5,50 Z" id="Oval-23" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
+                <path d="M33.5,50 C37.0898509,50 40,47.0898509 40,43.5 C40,39.9101491 37.0898509,37 33.5,37 C29.9101491,37 27,39.9101491 27,43.5 C27,47.0898509 29.9101491,50 33.5,50 Z" id="Oval-23" fill="#FFC800" sketch:type="MSShapeGroup"></path>
                 <text sketch:type="MSTextLayer" font-family="Exo 2" font-size="18" font-weight="normal" fill="#FFFFFF">
                     <tspan x="0" y="74">Gosterge</tspan>
                 </text>
@@ -626,7 +606,7 @@
                     <text id="12" sketch:type="MSTextLayer" font-family="Lucida Grande" font-size="24" font-weight="bold" sketch:alignment="middle" letter-spacing="-1" fill="#CE290F">
                         <tspan x="4.91796875" y="26.4873125">12</tspan>
                     </text>
-                    <path d="M19.5,50 C23.0898509,50 26,47.0898509 26,43.5 C26,39.9101491 23.0898509,37 19.5,37 C15.9101491,37 13,39.9101491 13,43.5 C13,47.0898509 15.9101491,50 19.5,50 Z" id="Oval-23" fill="#CE290F" sketch:type="MSShapeGroup"></path>
+                    <path d="M19.5,50 C23.0898509,50 26,47.0898509 26,43.5 C26,39.9101491 23.0898509,37 19.5,37 C15.9101491,37 13,39.9101491 13,43.5 C13,47.0898509 15.9101491,50 19.5,50 Z" id="Oval-23" fill="#DE3F25" sketch:type="MSShapeGroup"></path>
                 </g>
                 <g id="Slot-1,10" transform="translate(379.000000, 0.000000)">
                     <rect id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup" x="-0.424" y="-0.3231875" width="39" height="58" rx="8"></rect>
@@ -741,6 +721,12 @@
                 <path d="M114,-0.235 L114,114 L-0.238,114 C-0.01,51.009 51.008,-0.008 114,-0.235" id="Shape_251_" fill="#48AF5E"></path>
                 <path d="M81.215,48.569 L59.96,48.569 C57.488,48.569 55.485,50.572 55.485,53.043 L55.485,85.483 C55.485,87.954 57.488,89.957 59.96,89.957 L81.215,89.957 C83.686,89.957 85.689,87.954 85.689,85.483 L85.689,53.043 C85.688,50.572 83.686,48.569 81.215,48.569 L81.215,48.569 L81.215,48.569 Z M70.588,75.609 C67.08,75.609 64.241,72.766 64.241,69.262 C64.241,65.755 67.08,62.915 70.588,62.915 C74.092,62.915 76.935,65.755 76.935,69.262 C76.935,72.768 74.092,75.609 70.588,75.609 L70.588,75.609 L70.588,75.609 Z" id="Shape_252_" fill="#FFFFFF"></path>
             </g>
+            <text id="Quota" fill="#FFFFFF" sketch:type="MSTextLayer" font-family="Exo 2" font-size="20" font-weight="bold">
+                <tspan x="135.5" y="637.318984">Quota: 722 </tspan>
+            </text>
+            <text id="Kakush" fill="#FFFFFF" sketch:type="MSTextLayer" font-family="Exo 2" font-size="20" font-weight="bold">
+                <tspan x="814" y="638">Kakush: 722 </tspan>
+            </text>
         </g>
         <path d="M680.82681,16 L661.143994,16 C658.854843,16 657,17.8548426 657,20.1430683 L657,50.1835548 C657,52.4717805 658.854843,54.3266231 661.143994,54.3266231 L680.82681,54.3266231 C683.115036,54.3266231 684.969878,52.4717805 684.969878,50.1835548 L684.969878,20.1430683 C684.968952,17.8548426 683.115036,16 680.82681,16 L680.82681,16 L680.82681,16 Z M670.985865,41.0399123 C667.737344,41.0399123 665.108338,38.4072025 665.108338,35.1623855 C665.108338,31.9147904 667.737344,29.2848588 670.985865,29.2848588 C674.230682,29.2848588 676.863392,31.9147904 676.863392,35.1623855 C676.863392,38.4090546 674.230682,41.0399123 670.985865,41.0399123 L670.985865,41.0399123 L670.985865,41.0399123 Z" id="Okey-Tash-Logo-2" fill="#517ECE" sketch:type="MSShapeGroup"></path>
         <path d="M717.82681,16 L698.143994,16 C695.854843,16 694,17.8548426 694,20.1430683 L694,50.1835548 C694,52.4717805 695.854843,54.3266231 698.143994,54.3266231 L717.82681,54.3266231 C720.115036,54.3266231 721.969878,52.4717805 721.969878,50.1835548 L721.969878,20.1430683 C721.968952,17.8548426 720.115036,16 717.82681,16 L717.82681,16 L717.82681,16 Z M707.985865,41.0399123 C704.737344,41.0399123 702.108338,38.4072025 702.108338,35.1623855 C702.108338,31.9147904 704.737344,29.2848588 707.985865,29.2848588 C711.230682,29.2848588 713.863392,31.9147904 713.863392,35.1623855 C713.863392,38.4090546 711.230682,41.0399123 707.985865,41.0399123 L707.985865,41.0399123 L707.985865,41.0399123 Z" id="Okey-Tash-Logo-3" fill="#F6A623" sketch:type="MSShapeGroup"></path>

apps/web/rebar.config

@@ -1,11 +1,12 @@
 {deps, [
-    {erlydtl,".*",{git,"git://github.com/evanmiller/erlydtl.git",{tag,"0.8.0"}}},
-    {n2o,           ".*", {git, "git://github.com/5HT/n2o",                "HEAD"}}
+    {erlydtl, ".*", {git, "git://github.com/evanmiller/erlydtl", {tag,"0.8.0"}}},
+    {n2o,     ".*", {git, "git://github.com/5HT/n2o",            "HEAD"}}
 ]}.
+
 {erlydtl_opts, [
     {doc_root,   "priv/templates"},
     {out_dir,    "ebin"},
-   {compiler_options, [report, return, debug_info]},
+    {compiler_options, [report, return, debug_info]},
     {source_ext, ".html"},
     {module_ext, "_view"}
 ]}.

otp.mk

@@ -18,7 +18,7 @@ relx     := "{release,{$(RELEASE),\"$(VER)\"},[$(RELEASE)]}.\\n{include_erts,tru
 test: eunit ct
 compile: get-deps static-link
 delete-deps get-deps compile clean update-deps:
-	./mad $@
+	rebar $@
 .applist:
 	$(eval APPS := $(subst deps/,,$(subst apps/,,$(shell find apps deps -maxdepth 1 -mindepth 1 -type d))))
 	./orderapps.erl $(APPS) > $@

rebar.config

@@ -2,12 +2,7 @@
 {lib_dirs,["apps"]}.
 {deps_dir,"deps"}.
 {deps, [
-    {erlydtl,       ".*",{git,"git://github.com/evanmiller/erlydtl.git",{tag,"0.8.0"}}},
-    {shen,          ".*", {git, "git://github.com/5HT/shen",                "HEAD"}},
-    {rest,           ".*", {git, "git://github.com/synrc/rest",                "HEAD"}},
-    {gproc,          ".*", {git, "git://github.com/uwiger/gproc.git", "HEAD"}},
-    {sync,          ".*", {git, "git://github.com/doxtop/sync", "HEAD"}},
-    {n2o_scripts,    ".*", {git, "git://github.com/synrc/n2o_scripts", "HEAD"}},
-    {avz,	     ".*", {git, "git://github.com/synrc/avz.git", "HEAD"}}
+    {shen,           ".*", {git, "git://github.com/5HT/shen",           {tag,"1.5.0"}}},
+    {active,         ".*", {git, "git://github.com/synrc/active",       {tag,"0.5"}}},
+    {avz,            ".*", {git, "git://github.com/synrc/avz",          {tag,"1.4.0"}}}
 ]}.
-