Merged master to 1.0

This commit is contained in:
Christoph Oberhofer
2017-03-08 22:01:44 +01:00
28 changed files with 25357 additions and 29937 deletions
+12702 -15155
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long