Controllers
Merge branch 'devel' of https://github.com/piotras-s/tatusiowo into devel
Merge branch 'devel' of https://github.com/piotras-s/tatusiowo into devel
Merge pull request #29 from piotras-s/feature_templates

Feature templates
Merge pull request #2 from galileo/feature-activity-controller

Feature activity controller
login form
search page
Merges with marej