Merge commits from beginning to 23/08/2013

Merge commits from beginning to 23/08/2013