remove application collection, model, template, and view
merge master