Revert "..."

This reverts commit 991f6c61b509c71f3d0cc7192d278e953311580d.
Revert "..."

This reverts commit 57c6f1dc1361c296331218f19a48906dac870c54.
Revert "Revert "...""

This reverts commit 39ce87ed18844aad320f2c4b305d35e8d3415a2e.
Merge branch 'master' of https://github.com/iele/FanfouWP2.git