solved 1st march issues
Merge remote-tracking branch 'remotes/origin/28_feb_2014'
merged 28 feb