Pushing changes from 17/04/2013
Merge
Merging commits