updated framework 12:51 2/9/2013

framework updated fro master