Merge pull request #12 from yahor/master

controllers, views, routes code cleanup. Reviewed
Merge remote-tracking branch 'upstream/master'