last fixes
Merge branch 'master' of github.com:herbertsg/processmaker into LastFixesforJenkins

Conflicts:
	tests/functional/default.conf
	tests/functional/src/main/java/com/colosa/qa/automatization/tests/pmslaPlugin/TestSLAProcessByParalellEvaluation.java
Las fixes for run Jenkins
Change main and default
Merge pull request #216 from Ademarh/LastFixesforJenkins

Last fixesfor jenkins