So much WORK..
Merge branch 'version2' of https://github.com/henrikromby/toolcontrol into version2

Conflicts:
	version2/templates/actions/version2/delete_building_sites.html
	version2/templates/actions/version2/delete_containers.html
	version2/templates/actions/version2/delete_employees.html
	version2/templates/actions/version2/delete_models.html
	version2/templates/actions/version2/delete_tool_categories.html
	version2/templates/actions/version2/delete_tools.html
	version2/templates/actions/version2/loan.html
	version2/templates/actions/version2/loan_containers.html
	version2/templates/actions/version2/lost.html
	version2/templates/actions/version2/make_building_sites_active.html
	version2/templates/actions/version2/make_building_sites_inactive.html
	version2/templates/actions/version2/make_containers_active.html
	version2/templates/actions/version2/make_containers_inactive.html
	version2/templates/actions/version2/make_employees_active.html
	version2/templates/actions/version2/make_employees_admin.html
	version2/templates/actions/version2/make_employees_inactive.html
	version2/templates/actions/version2/make_employees_loan_flagged.html
	version2/templates/actions/version2/make_employees_nonadmin.html
	version2/templates/actions/version2/make_employees_not_loan_flagged.html
	version2/templates/actions/version2/repair.html
	version2/templates/actions/version2/reserve.html
	version2/templates/actions/version2/return.html
	version2/templates/actions/version2/return_containers.html
	version2/templates/actions/version2/scrap.html
	version2/templates/actions/version2/service.html
	version2/templates/customer/database/building_sites/confirm_delete.html
	version2/templates/customer/database/building_sites/create.html
	version2/templates/customer/database/building_sites/list.html
	version2/templates/customer/database/building_sites/update.html
	version2/templates/customer/database/containers/confirm_delete.html
	version2/templates/customer/database/containers/create.html
	version2/templates/customer/database/containers/list.html
	version2/templates/customer/database/containers/update.html
	version2/templates/customer/database/employees/confirm_delete.html
	version2/templates/customer/database/employees/create.html
	version2/templates/customer/database/employees/list.html
	version2/templates/customer/database/employees/update.html
	version2/templates/customer/database/tool_categories/confirm_delete.html
	version2/templates/customer/database/tool_categories/create.html
	version2/templates/customer/database/tool_categories/list.html
	version2/templates/customer/database/tool_categories/update.html
	version2/templates/customer/database/tool_models/confirm_delete.html
	version2/templates/customer/database/tool_models/list.html
	version2/templates/customer/database/tools/actions/base.html
	version2/templates/customer/database/tools/confirm_delete.html
	version2/templates/customer/settings/change_password.html
	version2/templates/customer/settings/front.html
	version2/templates/version2/create_tool.html
	version2/templates/version2/update_building_site.html
	version2/templates/version2/update_tool_category.html