Merge pull request #54 from saulelis/sidebar

sidebar half way
Groupable some changes
Merge pull request #55 from saulelis/groupables

Groupable some changes
minor
conflicts
Merge pull request #56 from saulelis/hp

minor
sidebar finished