merge with dev manually

This commit is contained in:
Desmis
2017-08-15 09:57:19 +02:00
15 changed files with 2241 additions and 1923 deletions

File diff suppressed because it is too large Load Diff