Merge branch 'master' into 1.0

Conflicts:
	setup.py

CHANGES.txt

 Changes
 =======
 
+1.0.14 (2015-10.26)
+-------------------
+ * kvm recipe: Allow to set keyboard layout language used by qemu and VNC
+ * simplehttpserver-recipe: fix encoding error
+
 0.103 (2015-07-24)
 ------------------
   * kvm: fix issues with boolean parameters and add 'qed' in external disk format list.

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.9'
+version = '1.0.14'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"