US533 - Added all fields with validation including javascript
Merge branch 'development' into development-work