Merge commits from beginning to 16/08/2013

Merge commits from beginning to 16/08/2013