index and show working, started on new item
Merge branch 'dev'

working index and show page, partial new item