Resolved some problems in FI-LAB
Merge branch 'master' of https://github.com/ging/fi-ware-cloud-portal