Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 c582da1780e3d11b0d12deb42de281b92d76bf6f

 interface/web/sites/templates/web_directive_snippets.htm

@@ -10,5 +10,5 @@
         {tmpl_var name='name'}

      </option>

      </tmpl_loop>

   </select>

</div></div>
   </select></div>

</div>