Merged master fixed conflict.
added dependencies and missing translations