install now compensates for changing archived folder, change branch to dev
Merge remote/offline changes in 'dev'

Conflicts:
	install