Merge origin/master

26/02/2014
Merge origin/master

26/02/2014