Merge branch 'master' of github.com:herbertsg/processmaker into TestProcessSupervisor
Fixes for demo
Merge pull request #161 from Ademarh/FixesSprint9

Fixes sprint9