update gitignore
reorganized templates for inheritance, added start of dashboard view
moved bootstrap js
merge