Merge branch 'scaffold_change'
Merge branch 'scaffold_change'
Start of support for item templating (bootstrap 3 is default)
Merge branch 'scaffold_change' (reverted from commit f8630cd6a5a3e03e1725ae5261104d4bde2b7ddb)
Merge branch 'scaffold_change'
forece delete of view files
Merge branch 'master'