i've got conflicts
Merge branch 'master' of https://github.com/USACE-MMC/bootleaf

Conflicts:
	assets/js/router.js
get project switching working