Feature #1226: Request UniversalId editing from table column
Feature #1226: fixes
CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build.
fix
Rework book formatter (Fixes #1148)
Remove redundant includes
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
Book formatter: Fix last block of text not displaying
minor fix
Merge branch 'edit'
fix for potential script problem during saved game loading
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
Book parser: Fix comparison between signed and unsigned integer expressions
Book formatter: Do not insert last page if it's empty, code cleanup
Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2
Check for text size
Fix for MSVC warnings
Merge remote-tracking branch 'slothlife/msvc-warning-fix'

Conflicts:
	CMakeLists.txt
Added code to play music on level up and on death
Merge remote-tracking branch 'miroslavr/master'