First commit. Some renew conflicts are still present, main functionality is realized.
Merge branch 'master' of https://github.com/arassadin/Wave_renew