[sprint-30 resolved issues SAT-324, SAT-336, SAT-337, SAT-342, SAT-343, SAT-330 , SAT-325, SAT-333, SAT-326, SAT-331, SAT-329]
merge Vivek changes 12 april 2013