Merge branch 'hotfix/0.1.1'
Merge branch 'master' of github.com:matrufsc2/frontend into develop
Added temporary file that describes about.tpl page.
Merge branch 'develop' of github.com:matrufsc2/frontend into develop
Added about.tpl template ("About" page).