Refactored cucumber cleaning logic
Refactored feature test: removed @dirty use @clean
Merge branch 'next' of github.com:zhdk/madek into next