Merge branch 'development'
little adjustment to chaos code to be adapted to qt 5.0

Change-Id: I3f0e3a73127cb63e8018672913bb85af688dc042