merge part 1
Merge branch 'master' of https://github.com/mduduzik/flowframe
Updated LiferayPortalServicesImpl.java