Fully Updated Calculator to 05/09/2013

Also added the commit which Sniper pushed to jellybean branch by mistake