Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into cust_fields

Conflicts:
	other/upgrade_2-1_mysql.sql
	other/upgrade_2-1_postgresql.sql
	other/upgrade_2-1_sqlite.sql

Signed-off-by: Suki <suki@missallsunday.com>
turns out the gender icons are sprites now.

Signed-off-by: Suki <suki@missallsunday.com>
ICQ needed some love

Signed-off-by: Suki <suki@missallsunday.com>
aim neded some love

Signed-off-by: Suki <suki@missallsunday.com>
yahoo needed some love

Signed-off-by: Suki <suki@missallsunday.com>
A couple more places needed the new order by

Signed-off-by: Suki <suki@missallsunday.com>
meh old code shouldn't be here

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #1476 from MissAllSunday/cust_fields

Cust fields
LOL forgot to update the install files

Signed-off-by: Suki <suki@missallsunday.com>
apply upgrade fixes for postgre and sqlite

Signed-off-by: Suki <suki@missallsunday.com>
apply suggested fixes for legacy attachments on postgre and sqlite

Signed-off-by: Suki <suki@missallsunday.com>
Add the new show_mlist column

Signed-off-by: Suki <suki@missallsunday.com>
insert the value, default fields will not appear on memberlist

Signed-off-by: Suki <suki@missallsunday.com>
Adding yet another new column, show_mlist

Signed-off-by: Suki <suki@missallsunday.com>
Add the new row value for column show_mlist to the default fields

Signed-off-by: Suki <suki@missallsunday.com>
oops! forgot to add the show_mlist column...

Signed-off-by: Suki <suki@missallsunday.com>
Fix a typo in updating the old cust fields order

Signed-off-by: Suki <suki@missallsunday.com>
One last thing...
Location fits better on the standard placement...

Signed-off-by: Suki <suki@missallsunday.com>
Add the UI entry

Signed-off-by: Suki <suki@missallsunday.com>
Add logic code for the new UI additions

Signed-off-by: Suki <suki@missallsunday.com>