comments #8 - file views and templates

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'file' into develop