Translation fixes, implementation of master changes

- forgot about-us page -> translated now
- some small fixes
- implemented all new changes from master