sidebar ~
full merge
CRUD for modules
activities CRUD ok
admin module/activity interface
float blocks
hide block
editing...
admin panel for module and activity done
admin fix
~
module page
activity page
..
merge amster
test
planning backend ok
planning simili front-end
planning css
fix css