removed duplicate files
Merge branch 'master' into beta
code simplification
Merge branch 'master' into beta
VERSION => 2.2 beta 7
Merge branch 'master' into beta