* Added gitattributes file to normalise line endings on checkin/checkout
 * Replaced .c files with .cpp in gitattributes (oops, misread).
 * Started updating User::GetUserInfo().
 * Cleaned up User::UserInOut().
Fixed ODBC's unsupported concurrency warning.
Added Chaotic Generator object type (OBJECT_CHAOTIC_GENERATOR) to ObjectType enum (NOTE: post-1.298 only.)
Merged in maxmenten's changes
Finalised merge.
Cleaned up most of the region code, deprecated CUser::GetUserInfo(char*, int&) and added CUser::isMerchanting().
Deprecated CNpc::GetNpcInfo(), added foreach_region() (needs moving), cleaned up the rest of the region code.
Fixed position bug with MerchantUserInOutForMe().
Fetched maxmenten/master
Merge finalised
Removed CUser::MagicSystem() call (as it's not yet been implemented, and will probably be heavily revised anyway).
Merge fixes 2