update PATH

update PATH
Merge branch 'dev'

Conflicts:
	.bashrc