added items to the base menu and also more code to options menu
merged
??
??
??
??
WTF!!
??
??
??
fixed conflicts now up to date with options class and all of base menu
121212
12
trying fix master
yfllln
hello