commit 117 - 16/04/2013
Merge remote-tracking branch 'origin/dev'