Resolving more problems
Merge branch 'Companies' of github.com:Peque/induforum into Companies