new version
Merge branch 'dev' of https://github.com/saschare/Friday into dev