Merge commits from beginning to 20/08/2013

Merge commits from beginning to 20/08/2013