Merged bug3 into stable
added f12
Merge branch 'master' into stable
version
changed version
Merge branch 'master' into stable
f13
bug regle
Merged bug4 into master