Fixed a lot of bugs
Merge branch 'master' of github.com:gabrielfarah/OpenHub