Misc

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Merge branch 'master' of github.com:ExCiteS/Sapelli