re-added hasMerged. Also added comment to prevent it from being removed in the future
changed comment that encouraged people to edit core files
Made default jobs' salaries depend on GM.Config.normalsalary. Fixes #1294
Fixed #1266
Removed vote restrictions to put them in the darkrpmod
Changed the database module to follow the mysqlite repository from
git@github.com:FPtje/MySQLite.git