add template barnelli
add missing file
add missing js
conflict
template stucture fix
Merge branch 'staging' into 2-reservation
route bug fix. be careful using /reservation[/][:action]