Idea's file
Merge branch 'master' of https://github.com/Draan/fruju_main
Merge branch 'master' into rory