Lars Brubaker 3fc69a7e81 Merge branch '1.7' into design_tools ... # Conflicts: # StaticData/Translations/Master.txt		2017-04-12 18:28:16 -07:00
..
Layouts.txt	Merge branch '1.7' into design_tools	2017-04-12 12:29:31 -07:00
Properties.json	Merge branch '1.7' into design_tools	2017-04-12 18:28:16 -07:00