Code base update for 5.0

Code base update to S4E 2013.10.31.22
Reorganized prefs