Population of the merchant temp list was using the rows from query in the
wrong order.  Only noticed when templist not cleared on server restart using
that rule.
Changed constants for new faction system.
New faction system.
Merge branch 'master' of github.com:noudess/Server