last fixes
Merge branch 'master' of github.com:herbertsg/processmaker into lastFixesSprint10
Merge branch 'master' of github.com:herbertsg/processmaker into lastFixesSprint10
The last fix
Fix Home
Merge branch 'master' of github.com:herbertsg/processmaker into lastFixesSprint10

Conflicts:
	tests/functional/src/main/java/com/colosa/qa/automatization/pages/Admin.java
Merge pull request #197 from Ademarh/lastFixesSprint10

Last fixes sprint10