Merging Working Time Restriction from Testing to Master

## Impex Generator
Tested on UAT (Still needs works on L3)

## All other modules hasn't been touched
Redundant curly braces around a hash parameter.<br>Use the new Ruby 1.9 hash syntax.<br>Use 2 (not 4) spaces for indentation.<br>Line is too long. [95/80]<br>Space inside { missing.<br>Space inside } missing.