Template changes
Merge branch 'finnish' of github.com:TomiToivio/Booktype
Merge branch 'master' of github.com:TomiToivio/Booktype into finnish
Bug fixing
Merge branch 'master' of github.com:TomiToivio/Booktype into finnish