Condition template
fixed conflict in service.js
Merge branch 'current-sprint' into ISSUE-98-add-process-to-upload