Merge branch 'master' of https://github.com/buildcom/BossyUI

Conflicts:
	package.json
Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/BossyUI
Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/BossyUI