resolved an issue with javascript
setting order on job_orders
started removing activity type
removed activty type
splitted ativity and job order in two columns
Merge branch 'master' into public