Some older stuff that was stil on my laptop...
Merge branch 'develop' of https://github.com/vrbh/site into develop