update to RC6#17

Foxandxss wants to merge 2 commits intojuliemr:masterjuliemr/ng2-test-seed:masterfrom

Foxandxss:pr16-jesusFoxandxss/ng2-test-seed:pr16-jesusCopy head branch name to clipboard