fixed add unit
merged with abhi
preload images
conflict resolve
some changes here and there
Manual merge of dev_anpatel and dev_sramanujan to master
Updated image loading