updated framework 12:51 2/9/2013

framework updated fro master
updated master 1:00 2/9/2013
commit

naveen committed
Merge pull request #3 from naveenav/master

naveen commited