first commit lots to do
merging versions
merged and fixed conflicts
Added searchbox n changed some JS
Merge with master messed up my changes
fixed marker windows